Temporarily use new table
Merge branch 'cleanup2' into feature-minizone
replace readme.txt with readme.md
Merge branch 'develop' into feature-minizone
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into 3.6
Merge branch 'develop' into feature-minizone
Use new zone field
Controller action spike
Spike
real time Blank theme options
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into 3.6
Merge evolution into feature-minizone
Assign action to page
fix tests
Cleanup
Cleanup
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into develop
fix wizard
fix wizard suggestios
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into develop

Conflicts:
	ip_cms/modules/administrator/wizard/public/wizard.js