Self driving tank
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	views/tank.coffee