Rebase
Merge pull request #37 from vladpupaza/Cosmin_15

content view Jasmine unit Testing