Add back format 12p/8a (for 12pm/8am)

Also accept format mm/dd
Merge branch 'master' of https://github.com/cs2103aug2014-w10-4j/main