direction
Merge branch 'master' of github.com:c-esswein/autonom-ps

Conflicts:
	PS2DSelfLocalisation/bin/dexedLibs/ioiolib-de9962adb22a85f8386e7c0c72ce30f9.jar
	PS2DSelfLocalisation/bin/dexedLibs/opencv library - 2.4.4-1de090596f4e4abea017c28aea8dffea.jar
	PS2DSelfLocalisation/src/uibk/autonom/ps/navigation/Navigator.java