Zhu Jinhui 0a31b33423 Merge dev to master 7 gadi atpakaļ
..
copyright 0a31b33423 Merge dev to master 7 gadi atpakaļ
modules.xml 0a31b33423 Merge dev to master 7 gadi atpakaļ
psr2.iml 0a31b33423 Merge dev to master 7 gadi atpakaļ
workspace.xml 0a31b33423 Merge dev to master 7 gadi atpakaļ