Merge branch 'refs/heads/feature-redesign-rantology' into develop

Conflicts:
	app/assets/stylesheets/sass/index.sass
	spec/spec_helper.rb