Fixed zip files in build.
Merge branch 'develop'

Conflicts:
	build-import.xml
Changed CHANGELOG.