refers to rating system
Merge branch 'origin/master' into origin/solr

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
added gitignore