added object check
fixed merge conflicts
Changed package
new package and admin submenu
Merge pull request #109 from ajstanley/7.x

Repackaged