Added popup states with pause screen
Merge branch 'master' of https://github.com/schwin42/Buffet-Hero

Conflicts:
	Assets/Prefabs/GameMaster.prefab
	Assets/Scenes/Default.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/83/83cc342a5c0c64bbd8f80a169c4b77de
	Library/metadata/ea/eaff5c67ebb804075a0a816fe055f84d