do merge
Merge branch 'master' of github.com:changyou/xocean

Conflicts:
	app/styles/main.css