Merge origin/master

Conflicts:
	src/Dingo/Dingo.java