resolve conflict
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'rt/master'
metrics graph axis
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/books.rb
CB step 1&2 changes
Wording changes Book Histories, Log.
Merge remote-tracking branch 'ta/master'
Merge remote-tracking branch 'rt/master'
Added "Technical brief", minor updates to dash.
My apps changes
Concurrent user fix, we'll pass a copy of email/api_key as opposed to a global var. Megam::Config[:email/:api_key]
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/controllers/cloud_books_controller.rb
	app/views/cloud_books/_book_details.html.erb
	app/views/cloud_books/index.html.erb
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_books/_tab_actions.html.erb
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/assets/javascripts/application.js
change modal in profile page