,
Merge branch 'master' of https://github.com/Sindoora90/TestPEMApp

Conflicts:
	.idea/vcs.xml