Fix local issues and user manager exception handling
Fix for ZF2 console routes.  Also implements Restore to the Admin screens
Merge remote-tracking branch 'upstream/master'
Merge pull request #171 from wshafer/master

Fix local issues
Merge remote-tracking branch 'upstream/master'