Added time parser, unit tests. Update json
Merge remote-tracking branch 'origin/master'