Merge pull request #166 from wshafer/master

Fix for admin bar height issues
Merge pull request #167 from wshafer/master

Clean up admin dir
fix local issues
Merge pull request #170 from rodmcnew/locale

fix local issues
Fix local issues and user manager exception handling