medals and states
Merge branch 'master' of github.com:metropolia-portal/toyparty

Conflicts:
	Assembly-CSharp.pidb
	Assets/Scenes/MainMenu/MainMenu.unity
	Assets/Scripts/MainMenu/MainMenuGUI.cs
	ProjectSettings/EditorBuildSettings.asset
	ToyParty.userprefs