Merge pull request #75 from californiavol/master

merge from master
added test controller to admin module
Merge pull request #77 from californiavol/macbook-branch

Macbook branch