rails generate contoller Admin user
[#77161738]
added Admin#make_admin and ajax functionality
[#77161738]
Merge branch 'reviews' into merge-with-reviews
fixed controller spec
[#77161738]
Added controller and ajax for can_review
still need to add cancan auth into contoller
[#77161738]
AddUserRefToBooks migration along with models and controller.
Now each book has a user when it is created by the controller.
You can access it with user.books or book.user.
This will allow us to add other features in mail and get permissions to
work correctly.
[Finishes #77521512]
cancan permisions for books
[#75987378]
get tests to pass
Merge branch feature-permissions into feature-admin

Conflicts:
	app/models/ability.rb
	app/models/book.rb
	spec/views/books/show.html.erb_spec.rb
Merge branch 'master' into feature-admin
refactored js and partials for can_do_books
[#77161738]
filled in permisions for banning users
[#77161738]
use load_and_authorize_resource in book controller
[#77161738]
handle cancan auth exceptions

[#76271294]
added a scope for active books on Book model
[#75986988]
Merge branch 'master' into 'feature-admin'
(merging admin features in with search and sort features)

Conflicts:
	app/models/book.rb
	db/seeds.rb
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
Merge pull request #23 from psytau/feature-admin

Feature admin