commit
Merge https://github.com/276361270/game

Conflicts:
	Makefile
	apps/game/ebin/game.app
	apps/game/ebin/game_app.beam
	apps/game/ebin/game_policy_server.beam
	apps/game/ebin/game_policy_sup.beam
	apps/game/ebin/game_sup.beam
	apps/game/ebin/game_tcp_flash_server.beam
	apps/game/ebin/game_tcp_flash_sup.beam
	apps/game/ebin/game_tcp_server.beam
	apps/game/ebin/game_tcp_sup.beam
	apps/game/src/game.app.src
	apps/game/src/game_app.erl
	apps/game/src/game_policy_server.erl
	apps/game/src/game_sup.erl
	apps/game/src/game_tcp_flash_server.erl
	apps/game/src/game_tcp_flash_sup.erl
	apps/game/src/game_tcp_server.erl
	deps/cowlib
	deps/ibrowse
	deps/lager
	deps/ranch
	rebar.config
	rel/files/app.config
	rel/files/erl
	rel/files/nodetool
	rel/reltool.config
	start.sh