saving text hotfix
administration started
Merge branch 'master' into test