Fix for ZF2 console routes.  Also implements Restore to the Admin screens
Merge remote-tracking branch 'upstream/master'
Code style fixes
Merge pull request #77 from wshafer/master

Implements Restore to the Admin screens