update version number and english locales
Merge branch 'develop' into release

Conflicts:
	cms/__init__.py
Merge branch 'develop' into release
english locales
english js locales