No changes.
Merge branch 'master' of https://github.com/nicolas-fricke/roboticon

Conflicts:
	js/mainOperator.js
Merge branch 'master' of https://github.com/nicolas-fricke/roboticon