+ New admin model, controller and views
+ New admin model, controller and views
Merge master into HEAD
+ updated admin template
+ updated admin template
Merge pull request #2 from AtreyuShoper/Alphy

Alphy
Merge pull request #3 from AtreyuShoper/master

Merging