Merge pull request #22 from mplaza/melabranch

Melabranch
Merge pull request #23 from mplaza/melabranch

fix controller
added search filter to admin page
Merge pull request #24 from mplaza/paulbranch

added search filter to admin page
added main div top padding
resolved merge conflicts
Merge pull request #25 from mplaza/paulbranch

added main div top padding
fixing merge