:)
Merge branch 'release/1.0.2.0'
Merge branch 'develop' into master-heroku

Conflicts:
	Gemfile.lock
	jobs/guests.rb
Merge branch 'master' into master-heroku