no message
Merge branch 'master' of https://github.com/giapnh/GoldMinerOnline

Conflicts:
	giapnh/Assembly-CSharp-Editor.pidb
	giapnh/Assembly-CSharp-firstpass.pidb
	giapnh/Assembly-UnityScript.pidb
	giapnh/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	giapnh/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	giapnh/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	giapnh/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	giapnh/Library/ScriptAssemblies/Assembly-CSharp.dll
	giapnh/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	giapnh/Library/assetDatabase3
	giapnh/Library/guidmapper
	giapnh/Library/metadata/c5/c59ba4dcdae0805478d03aa77ce84009
	giapnh/giapnh-csharp.sln
	giapnh/giapnh.sln
	giapnh/giapnh.userprefs