客户端——摇一摇
Merge branch 'master' of github.com:liwei92/taiko

Conflicts:
	taikoWebService/build/classes/com/taiko/database/TableMusicOperator.class
	taikoWebService/build/classes/com/taiko/database/TableResultOperator.class
	taikoWebService/build/classes/com/taiko/process/ShakeInviteServlet.class
	taikoWebService/build/classes/com/taiko/process/ShakeResponseServlet.class
	taikoWebService/build/classes/com/taiko/score/ResultServlet.class
	taikoWebService/build/classes/com/taiko/utility/DBOperator.class