Merge branch 'master' of https://github.com/AdwinTrave/fleet-command

Conflicts:
	client/style/fleet-command.css