Fixed master branch
removed tracking on workspace configuration file
add Battery update from Parse and details view for Challenges
preparing for merge with master
Merge branch 'master' into development

Conflicts:
	Liza.xcworkspace/xcuserdata/Ehis.xcuserdatad/UserInterfaceState.xcuserstate
Loading trophies from parse