testing merge
Merge branch 'master' of https://github.com/shashanksingh28/MFPI

Conflicts:
	GroupSavings/src/main/AndroidManifest.xml
	GroupSavings/src/main/res/values/strings.xml