Fixed db:migrate error
Merge branch 'master' of https://github.com/roomblocker/roomblocker-rails

* 'master' of https://github.com/roomblocker/roomblocker-rails:
  revision