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

Conflicts:
	Common.txt
Merge branch 'develop' of https://github.com/kalyand14/AndroidApp into feature/feature2

Conflicts:
	Common.txt
Merge branch 'feature/feature2' into develop