new working branch from AndroidApplication
Solved Merge errors
Fixed Scale
finished the puzzlegame
hob an haffa schmarrn gmacht
Merge branch 'Android_Application_GPSMax' of https://github.com/Rameos/ISMAR2014_GamesWorkshop into Android_Application_GPSMax

Conflicts:
	Ismar_BaseProject/Assets/Scripts/GPSControllerScript.cs
finalizing stuffy stuff
Merge branch 'Android_Application_GPSMax' into AndroidApplication

Conflicts:
	Ismar_ARLab/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
	Ismar_BaseProject/Assets/Scenes/GameSelector.unity
	Ismar_BaseProject/ProjectSettings/EditorBuildSettings.asset