Update gem dependencies.
Merge branch 'develop' of https://github.com/trema/paper-house into develop

Conflicts:
	Gemfile