create events and routes cleaned up
fixed merge conflicts with master
Merge branch 'master' into calendar
Merge pull request #29 from mkmizuta/calendar

Calendar
added config code for heroku
Merge pull request #30 from mkmizuta/calendar

added config code for heroku
User Dashboard Linked
Merge pull request #31 from mkmizuta/admin

User Dashboard Linked
added gem for heroku
Merge branch 'master' of github.com:mkmizuta/pea-patch-planner
gems for heroku and semantics
gems and heroku again
created group assets for gems
more gems and heroku
more gem, semantics and heroku
bundled install
more gem config for heroku
more gems
added precompile goodies
fixed bug