Hull- & shield-bar for client
Merge branch 'master' of https://github.com/Kuxe/oopprojekt