fix_nil_state_for_pages
Merge branch 'feature/add_state_machine-45' into staging
fix migrations
Merge branch 'feature/add_state_machine-45' into staging

Conflicts:
	db/migrate/20130125125505_fix_state_for_pages.rb
delete migrate
Merge branch 'feature/add_state_machine-45' into staging