donjakobo/A3M — pull request #52 by AdwinTrave (2013-07-19 17:09:32+00:00)
Title: Merge admin panel to master, fixes and improvements

Closes #48, closes #49

Merges admin panel to master, additional fixes.