add RubyMine workspace
cleanup
Merge branch 'feature/add_devise_and_active_admin'
Merge branch 'master' into feature/3_homepage

Conflicts:
	.gitignore
	app/assets/javascripts/landing.js.coffee
	app/assets/stylesheets/landing.css.scss