claira_button
Merge branch 'feature/claira_button' into develop

Conflicts:
	app/views/index.erb
	app/views/layout.erb
	public/javascript/application.js