2013
Merge branch 'master' of https://github.com/fay8296/empire

Conflicts:
	protocol/cpp/CS.CSQuickLoginMsg.pb.cc
	protocol/cpp/CS.CSQuickLoginMsg.pb.h
	protocol/cpp/boat.cs.pb.cc