ma version
Merge branch 'master' of https://github.com/debflav/mars

Conflicts:
	assets/js/rover.js