bundle updating sqlite3
Merge branch 'release/0.1' into develop

* release/0.1:
  bump version; update changelog
bundle updating sqlite3 again
comment out sqlite
Merge branch 'develop' of github.com:cyanglee/bigheart into develop

* 'develop' of github.com:cyanglee/bigheart:
  comment out sqlite
  bundle updating sqlite3 again
  bundle updating sqlite3
Add asset precomipled files for heroku
Merge branch 'master' of github.com:cyanglee/bigheart

* 'master' of github.com:cyanglee/bigheart:
  trans reset password email
  edit forgot password page and reset password email
  edit resend email confirmation page
  trans confirmation email
  fix seed create admin confirmataion email
  fix trans to pending state after edit story
  change story details length limit
  change mailer SMTP settings
  change mailer password
  remove domain name from mailer SMTP
  finish index page slogan
  change admin pw
  change admin email
  fix state migration
  change oauth controller user class
  add change state type migrate
  add rails_12factor gem
  change state type to integer
  add assets to gitignore
  move state machine out from development
Merge branch 'master' of github.com:cyanglee/bigheart

* 'master' of github.com:cyanglee/bigheart:
  add faceook id and secret for develop to  application.yml
  edit application yml
bundle updating sqlite3
Merge branch 'develop' of github.com:cyanglee/bigheart into develop
bundle updating sqlite3

Conflicts:
	Gemfile
bump version; update changelog
Merge branch 'release/0.1.1'