change application controller
Merge branch 'master' of github.com:alexstoddard/reBook
application controller
fix conflict
Merge branch 'master' of github.com:alexstoddard/reBook
Merge branch 'master' of github.com:alexstoddard/reBook
improve schedule time formats