Re-tab & optimize imports for all files in core.
added jode time handling
Merge remote-tracking branch 'upstream/master'