Fixes bug with Action permissions on edit
Merge branch 'master' into hotfix
Merge branch 'hotfix'
Updated Version 3.2.030
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-4

Conflicts:
	version.txt