Restructuring action bar/edit profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/menu/main.xml
Merge branch 'master' of https://github.com/johnpc/JAMMR