cleaned up the ui-windows (whitespaces, namespaces and includes)
Merge branch 'master' of github.com:brainpower/Maximum-Fish
Merge branch 'master' of github.com:brainpower/Maximum-Fish
Merge branch 'master' of github.com:brainpower/Maximum-Fish

Conflicts:
	src/renderer/ui/windows/MainMenu.cpp
	src/renderer/ui/windows/MainMenu.hpp
reanabled control-button fixes #19