changed event name
unity update
game ui
ignore
bla
no simplejson
bla
Merge branch 'master'

Conflicts:
	android/dragnslay/.idea/workspace.xml
	server/ChatServer/main.js
	unity/Assembly-UnityScript-firstpass-vs.unityproj
	unity/Assembly-UnityScript-firstpass.unityproj
	unity/Assembly-UnityScript-vs.unityproj
	unity/Assembly-UnityScript.unityproj
	unity/Assets/Plugins/Newtonsoft.Json.dll.meta
	unity/Assets/Plugins/SimpleJson/SimpleJson.dll.meta
	unity/Assets/Plugins/socket.io-csharp-client.meta
	unity/Assets/Plugins/socket.io-csharp-client/Newtonsoft.Json.dll.meta
	unity/Assets/Src/net/kibotu/sandbox/unity/dragnslay/game/Game1vs1.cs
	unity/Assets/Src/net/kibotu/sandbox/unity/dragnslay/network/PackageFactory.cs
	unity/Assets/Src/net/kibotu/sandbox/unity/dragnslay/network/SocketHandler.cs
	unity/Assets/scenes/initscene.unity
	unity/unity-csharp.sln
	unity/unity.sln