Heihei
Merge branch 'master' of github.com:gaymer/Gaymer2.0

Conflicts:
	Style/BaseStyle.css
Header
titi fikse registrering
Merge branch 'master' of github.com:gaymer/Gaymer2.0