Changed watchdog statements to watchdog exception statements
Added constants for the date formats used by alma
Resolved merge conflict in alma reservation
Merge branch 'development' of github.com:ding2tal/alma into development