no message
Merge branch 'master' of https://github.com/forfunza/NewYearGame

Conflicts:
	NewYear/Assets/Photon/Photon Unity Networking/Demos/MarcoPolo-Tutorial/NetworkCharacter.cs
	NewYear/Assets/Resources/First Person Controller.prefab
	NewYear/Assets/Scenes/GameThaiScene.unity
	NewYear/Assets/Scripts/GameEvent.cs