Upgrade to Rails 4
Merge branch 'rails_4' of github.com:TimePulse/TimePulse into rails_4