Clickable positions
Merge branch 'master' into button_frontpage

Conflicts:
	app/views/frontpage/index.html.erb
Merge branch 'button_frontpage'