fixed schedule & calendar confliction
Merge branch 'master' of http://github.com/luzerno/caramel
deleted readme
fixed issue #52
fixed issue #54
Merge branch 'master' of heroku.com:musickids
removed the term query constraint in schedule model, fixing issue  #49
fixed issue #59
Merge remote-tracking branch 'heroku/master'
Fix student new for teacher login
Fix the bug of student page
Add the region page for teacher and staff #41