[#76923754] Added search functionalit
Merge branch 'master' of https://github.com/psytau/RailsBookCheckout
[76923754] Adding search, and merging master into my branch
Merge pull request #20 from psytau/Search

Pull request #76923754
Fixed rating cucumber test
Merge pull request #21 from psytau/Search

Fixed rating cucumber test
[#76923746] Added sort functionality
Merge pull request #22 from psytau/Sort

[#76923746] Added sort functionality
Update README.rdoc
Merge branch 'master' into 'feature-admin'
(merging admin features in with search and sort features)

Conflicts:
	app/models/book.rb
	db/seeds.rb
Update README.rdoc
[#76923746] Added user ability to follow, deactivate books, protect books with reviews/ratings
Merge pull request #24 from psytau/Follow

[#76923746] Added user ability to follow, deactivate books, protect book...
git ignore solr data, lck and pids
Merge branch 'master' into 'feature-admin'
(merged in follow and activate features)

Conflicts:
	app/controllers/books_controller.rb
	db/schema.rb
	solr/development/data/index/_13.fdx
	solr/development/data/index/_13.fnm
	solr/development/data/index/_13_Lucene41_0.doc
	solr/development/data/index/segments.gen
	solr/development/data/tlog/tlog.0000000000000000035
removed a solr pid file from version controll