Merge Conflict
Merge branch 'master' of https://github.com/bdludwig/Thymio.git

Conflicts:
	Thymio/src/thymio/Thymio.java