fixed the parser error as well as the testing includes and the junit deprecations
Merge branch 'master' of https://github.com/amb8805/calendar