Merge branch 'develop' resolve #1
admin admin edit tests
bug fix
Merge branch 'hotfix/fix_helper'
add php tag
Merge branch 'hotfix/fix_documentation'
Merge branch 'master' into develop