some profilefragment stuff
Merge branch 'master' of https://github.com/partyhopper/PartyHopper

Conflicts:
	PartyHopper/res/values/strings.xml