updated Gemfile
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype

Conflicts:
	Gemfile.lock
Gem update
Merge branch 'master' of https://github.com/Cominch/dial-a-device