Add basic tank class.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	views/startup.coffee
Added retarded Jaws integration
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	views/index.haml
	views/startup.coffee