Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Merge branch 'slave'
Have totally forgot to commit anything worked on this week!!! :( all changes are on master git
Merge branch 'master' into slave

Conflicts:
	Application/platforms/AVF-Android/android/assets/www/js/main.js

Application/platforms/AVF-iOS/ios/AVFApp.xcodeproj/project.xcworkspace/x
cuserdata/ShaunThompson.xcuserdatad/UserInterfaceState.xcuserstate