Version 5.11.14 mittags
Version 5.11.14 mittags
5.11.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thymio/src/main/Pathfinder.java
	Thymio/src/thymio/Thymio.java
resolved manually.