Added 12hours format, resolved #4, updated grunt