commiting
Merge branch 'master' of https://github.com/bbhaskar24/MyProject

Conflicts:
	SampleApp/BuildProject/src/build.bat