fix bug
Merge branch 'dev' of github.com:victorgong/intime into dev

Conflicts:
	app/assets/javascripts/index_water.js