..
Merge branch 'master' of https://github.com/andersndanielsen/RobotinoController

Conflicts:
	src/bionic/engineering/robotinocontroller/MainActivity.java