7
7
Merge branch 'master' into integration

Conflicts:
	Gemfile