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

Conflicts:
	CMS/Default.aspx.cs