updating gems
Merge pull request #311 from fusion94/kandan-310/update_dependencies

updating gems
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  updating gems

Conflicts:
	Gemfile.lock