fixed empty state at pages
fix migrate
fixed migrate
some refactoring
Merge branch 'feature/add_state_machine-45' into staging
Merge branch 'feature/main_event_50' into staging
fixed migrate for pages
Merge branch 'staging' of github.com:kaize/castle into staging
Merge branch 'feature/add_state_machine-45' into staging
add database.yml.sample
fixed fix_state
Merge branch 'feature/add_state_machine-45' into staging
fixed state
Merge branch 'feature/add_state_machine-45' into staging

Conflicts:
	db/migrate/20130125125505_fix_state_for_pages.rb
comment for test
Merge branch 'feature/add_state_machine-45' into staging
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