add more features
add water
Merge branch 'yiweili' of https://github.com/yutongp/RaiseMeUp into ypei

Conflicts:
	client/code/app/game_client.js