preparing for merge with master
Merge branch 'master' into development

Conflicts:
	Liza.xcworkspace/xcuserdata/Ehis.xcuserdatad/UserInterfaceState.xcuserstate
Loading trophies from parse
added icons for challenge and usage
added username to signup