Add angularjs resolution
Solve conflict
Merge pull request #30 from sanemat/fix/bower-conflict

Fix bower conflict