home page fix
merge
home page
mailer settings, part one
content type fix
purchases buttons
Merge branch 'master' of github.com:Ukiebook/ukiebook
Merge branch 'master' into mb_conflict

Conflicts:
	app/controllers/books_controller.rb
	app/views/publications/index.html.erb
Basic view for publication review