clean up js date format error
Fix bug in defining embedded collection
Merge branch 'hotfix/define-collection-bug' into develop