Merge branch 'develop'
Updated to version 3.0.2

New string added in the administrator file.
Merge branch 'master' into develop