None
Merge branch 'master' of https://github.com/customato/customato

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb