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
Merge branch 'branchF1' into branchF2

Conflicts:

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