common change
Merge branch 'develop' of https://github.com/kalyand14/AndroidApp into feature/feature2

Conflicts:
	Common.txt