donjakobo/A3M — pull request #34 by donjakobo (2013-03-24 16:05:27+00:00)
Title: Admin Panel merge from @drofnas

Admin Panel merge from @drofnas, as the initial merge pull was to the `master` branch and not the `admin-panel`