Merge branch 'master' of https://github.com/andlef/YouHB_iOSApp into branchF1

Conflicts:

GameBuddy.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/Use
rInterfaceState.xcuserstate
update

update
update

update
update F2

update F2
Merge branch 'branchF1' into branchF2

Conflicts:

GameBuddy.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/Use
rInterfaceState.xcuserstate
update code.

update code.
update
update
Merge branch
update
update
update
update
xcuserstate
xcuserstate
update 0517
resolve confiction
update
Revert 8be0528..ad24ed7

This rolls back to commit 8be0528040547f612bff9abe24a3a574190c8d1b.
update'