tweak matrix
Merge remote-tracking branch 'origin/tweak-matrix' into develop

Conflicts:
	app/controllers/pages_controller.rb
Merge branch 'develop'