Rename constants in some places
Merge branch 'master' of https://github.com/PenchoPenchev/Team_JaneAusten

Conflicts:
	JaneAusten/JaneAusten/StartMenu.cs