Changed the SimpleDateTimeFormat to match the 12-hr format in the front end
Merge branch 'master' of https://github.com/Zerith90/IS480