Code refactoring.
Merge branch 'develop' of github.com:Schumix/Webadmin into develop