skill
Merge branch 'mock/20131122' into feature/regular/special_skill

Conflicts:
	new_billiards/Library/ScriptAssemblies/Assembly-CSharp.dll
	new_billiards/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	new_billiards/Library/assetDatabase3
	new_billiards/Library/metadata/11/11d1ee7ee4b234e1ba192c402a577a48
	new_billiards/Library/metadata/19/194d67783f51d4ac1afc4323cf2a5161
	new_billiards/Temp/__EditModeScene
	new_billiards/new_billiards-csharp.sln
	new_billiards/new_billiards.sln