Merge branch 'master' into squirrel

Conflicts:
	.gitignore
	3rdparty/TapjoySDK_iOS_v9.1.0/TapjoyEasyApp/TapjoyEasyApp/en.lproj/InfoPlist.strings
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp/CrittercismExampleApp-Prefix.pch
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp/CrittercismExampleAppAppDelegate.h
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp/en.lproj/InfoPlist.strings
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp/en.lproj/MainWindow.xib
	3rdparty/crittercismiOS-3.3.3/CrittercismExampleApp-crashonly/CrittercismExampleApp/main.m
	3rdparty/crittercismiOS-4.0.6/CrittercismExampleApp/CrittercismExampleApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	3rdparty/crittercismiOS-4.0.6/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleApp-Prefix.pch
	3rdparty/crittercismiOS-4.0.6/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleAppAppDelegate.h
	3rdparty/crittercismiOS-4.0.6/CrittercismExampleApp/CrittercismExampleApp/en.lproj/MainWindow.xib
	3rdparty/crittercismiOS-4.0.6/CrittercismExampleApp/CrittercismExampleApp/main.m
	3rdparty/crittercismiOS-4.1.2/.gitignore
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp.xcodeproj/project.pbxproj
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleApp-Info.plist
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleApp-Prefix.pch
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleAppAppDelegate.h
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleAppAppDelegate.m
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleAppViewController.h
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/CrittercismExampleAppViewController.m
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/en.lproj/InfoPlist.strings
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/en.lproj/MainWindow.xib
	3rdparty/crittercismiOS-4.1.2/CrittercismExampleApp/CrittercismExampleApp/main.m
	3rdparty/curl-7.19.7/lib/strequal.h
	ant/libmoai/jni/Android.mk
	ant/libmoai/jni/src/moai.cpp
	src/host-glut/GlutHost.cpp
	src/moai-android/MOAIAdColonyAndroid.h
	src/moai-core/MOAILogMgr.cpp
	src/moai-core/MOAILuaRef.h
	src/moai-iphone/MOAIAppIOS.h
	src/moai-iphone/MOAICrittercismIOS.mm
	src/moai-iphone/MOAIDialogIOS.h
	src/moai-iphone/MOAIPlayhavenIOS.h
	src/moai-sim/MOAISim.cpp
	xcode/libmoai/libmoai.xcodeproj/project.pbxproj
	xcode/osx/MoaiSample.xcodeproj/project.pbxproj
Resolved merge Issues
Project now runs on iPad but no sound
TODO Connect Untz library to Squirrel Sound System
Latest MOAI Merge status
Android ends straight after start
iOS Siri/Cal interrupt still an issue
Merge branch 'squirrel' into squirrel-moai

Conflicts:
	3rdparty/curl-7.19.7/lib/strequal.h
	ant/libmoai/jni/src/moai.cpp
	src/host-glut/GlutHost.cpp
	src/moai-android/MOAIAdColonyAndroid.h
	src/moai-core/MOAILogMgr.cpp
	src/moai-core/MOAILuaRef.h
	src/moai-iphone/MOAIAppIOS.h
	src/moai-iphone/MOAICrittercismIOS.mm
	src/moai-iphone/MOAIDialogIOS.h
	src/moai-iphone/MOAIPlayhavenIOS.h
	src/moai-sim/MOAISim.cpp
	xcode/libmoai/libmoai.xcodeproj/project.pbxproj