Merge remote-tracking branch 'origin/modal' into modal

Conflicts:
	Gemfile.lock