Started adding support for controllers
Merge branch 'develop' into feature/controller_support
Handle touch
Added controller input files
Merge branch 'develop' into feature/controller_support
Added files to visual studio
Added controller skeleton and send inputs to controller
Implemented more control stuff(doesn't work yet)
Merge branch 'develop' into feature/controller_support

Conflicts:
	android/jni/Application.mk
	vs2013/TestProject/source/TestScene.cpp
Controller button input finally works
Joysticks should work now too
Implemented controller for windows and cleaned up both implementations
Removed unnecessary  check from InputTouch.cpp
Merge remote-tracking branch 'origin/develop' into feature/controller_support

Conflicts:
	android/jni/main.cpp
	vs2013/AndroidTest/AndroidTest.vcxproj.filters
	vs2013/Platform/Platform.vcxproj
	vs2013/Platform/Platform.vcxproj.filters
	vs2013/TestProject/source/TestScene.cpp
Merge branch 'feature/controller_support' into develop