Merge branch 'mail' of https://github.com/BSG-TUDelft/Utopolis into mail
Fixed awkwardly placed compose button in Firefox
Reverted changes that occurred due to merge with player color.
Merge branch 'mail'