GS-11422
layout configurer added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/topology.js
GS-11422
layout configurer added