CMS-1967 __MACOSX sub folder should not be included in file import. Fixed bugs in default.properties.
Updated jparsec to vesion 2.0.1.
updated ES to special version  0.90.4-RC1
Merge branch 'master' of github.com:enonic/cms