upd on 24-7
Merge remote-tracking branch 'origin'
UPD after fix checkbox js
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/users/_create_user.html.erb
fb login fixed
updated gemlock
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/controllers/cloud_books_controller.rb
Before merge
Merge remote-tracking branch 'origin/master'
change Association has_one to has_many