LUN-1677: layout chooser should open in a popup
Merge remote-tracking branch 'origin/master' into LUN-1677

Conflicts:
	cms_blogger/admin.py
Merge pull request #40 from pbs/LUN-1677

LUN-1677: layout chooser should open in a popup