update gem dependencies
Merge pull request #73 from seedpod/update-dependencies

update gem dependencies
Merge branch 'refs/heads/master' into fix-password-reset

Conflicts:
	Gemfile.lock