style fixed
Merge remote-tracking branch 'origin/sprit-device' into split-device

Conflicts:
	app/views/layouts/application.html.erb