Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merged into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	1310Projects/platforms/android/assets/www/index.html
	1310Projects/platforms/android/assets/www/js/main.js
	1310Projects/platforms/android/bin/resources.ap_
	1310Projects/platforms/android/bin/sherLockHT.apk

1310Projects/platforms/ios/sherLockHT.xcodeproj/project.xcworkspace/xcus
erdata/SPCbrandenburg.xcuserdatad/UserInterfaceState.xcuserstate
	1310Projects/platforms/ios/www/config.xml
	1310Projects/platforms/ios/www/index.html
	1310Projects/platforms/ios/www/js/main.js
Merge branch 'master' into gh-pages

Conflicts:
	1310Projects/platforms/android/assets/www/index.html
	1310Projects/platforms/android/assets/www/js/main.js
	1310Projects/platforms/android/bin/resources.ap_
	1310Projects/platforms/android/bin/sherLockHT.apk

1310Projects/platforms/ios/sherLockHT.xcodeproj/project.xcworkspace/xcus
erdata/SPCbrandenburg.xcuserdatad/UserInterfaceState.xcuserstate
	1310Projects/platforms/ios/www/config.xml
	1310Projects/platforms/ios/www/index.html
	1310Projects/platforms/ios/www/js/main.js
Merged branches
Added final research
Merge branch 'gh-pages'

Conflicts:
	1310Projects/platforms/android/assets/www/js/main.js
	1310Projects/platforms/android/bin/resources.ap_
	1310Projects/platforms/android/bin/sherLockHT.apk

1310Projects/platforms/ios/sherLockHT.xcodeproj/project.xcworkspace/xcus
erdata/SPCbrandenburg.xcuserdatad/UserInterfaceState.xcuserstate