more admin work done
more work done on the admin
Merge pull request #1 from opencart/master

update from opencart/master