Add lib/wkhtmlimage binary
Add wkhtmlimage for production
Merge branch 'production-1.0.5' into production-1.0.6
Merge branch 'production-1.0.6' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Merge branch 'master' into production-1.0.7
Update sign up notifications to indicate where they originate from
Merge branch 'master' into production-1.0.7
Merge branch 'master' of github.com:wyclin/queenstown

Conflicts:
	app/views/devise/registrations/_sign_up_form.html.erb
Update Gemfile to re-add will_paginate
Update paginate calls in controller
Merge branch 'master' of github.com:wyclin/queenstown

Conflicts:
	app/views/devise/registrations/_sign_up_form.html.erb
Merge branch 'master' into production-1.0.7