upgraded to aasm 4
fix new aasm state behaviour

In the CMS edit page, the possible states are shown. Due to a change in AASM, this fix had to be made
Merge branch 'upgrade_to_aasm_four' of https://github.com/sumcumo/cms-fortress into sumcumo-upgrade_to_aasm_four

Conflicts:
	Gemfile.lock
bundled update
Merge branch 'sumcumo-upgrade_to_aasm_four'