Added theme/layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.haml