date format change
code clean up a bit
fix pararel bugs
Merge remote-tracking branch 'origin/hong_dev' into dev