Update with static container layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	preprocess/app/system/core/ma_layout.js