Update Gemfile
Merge branch 'dev' into features/angularjs

Conflicts:
	Gemfile.lock
Fix build