master
Merge pull request #6815 from jnpwebdeveloper/master
Same docs/admin task refactoring
Fix admin issues
Fix component order