demo 2014/11/17
fix fly
add plugin
r
Merge branch 'remove-network' into Demo

Conflicts:
	unity_game/ProjectSettings/EditorBuildSettings.asset
	unity_game/ProjectSettings/ProjectSettings.asset
Merge branch 'remove-network' into Demo

Conflicts:
	unity_game/Assets/editorScene.unity
	unity_game/Assets/prefabs/Avators/local_player_standard.prefab
h
Merge branch 'Demo' into remove-network