Merge pull request #20 from mplaza/melabranch

Melabranch
set up active model serializer, angular consumption
Merge pull request #21 from mplaza/paulbranch

set up active model serializer, angular consumption
merging