Merge pull request #43 from Pico88/admin-method-1

Admin controller - part 1
Merge remote-tracking branch 'upstream/master' into admin-method-2