-fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
Merge branch 'master' of https://github.com/okamstudio/godot

Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java
Update GodotLib.java
Merge branch 'master' into develop

Conflicts:
	core/io/file_access_pack.cpp
Merge branch 'develop' of https://github.com/sanikoyes/godot into develop

Conflicts:
	platform/android/java/src/com/android/godot/Godot.java