ui
Merge branch 'master' of https://github.com/akshatag/PennAppsX

Conflicts:
	Android/Smingle/app/src/main/res/layout/fragment_add_contact.xml