#30 combining the admin and edit views
Merge pull request #5 from crispab/merge-admin-edit

#30 combining the admin and edit views