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

Conflicts:
	Gemfile.lock