Merged branches
Merge branch 'gh-pages'

Conflicts:

1310Projects/platforms/ios/sherLockHT.xcodeproj/project.xcworkspace/xcus
erdata/SPCbrandenburg.xcuserdatad/UserInterfaceState.xcuserstate
Merged branches
Merge branch 'master' into gh-pages