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