Added freezing period before water flows, changed movingPlane color
Merge branch 'xinbweng' of https://github.com/yutongp/RaiseMeUp into ypei

Conflicts:
	client/code/app/game_client.js