Added BETA tag
Merge branch 'master' into create_ideas

Conflicts:
	app/assets/stylesheets/bootstrap_and_customization.css.scss