m1
Merge branch 'dev'

Conflicts:
	Gemfile
Revert 901ba83..610eea4

This rolls back to commit 901ba83085092e63e9e10d15c8d6e20d71915602.
bef merg
d1
m1
Merge branch 'master' into dev