Add top status bar
Merge branch 'master' of github.com:Z1MM32M4N/marauder

Conflicts:
	client/client.js
	client/maps.html
	client/marauder.css