Merge remote-tracking branch 'changyou/master'

Conflicts:
	app/styles/main.css
	app/views/index.html