Merge pull request #25 from aOberstar/master

AngularJS
Merge pull request #6 from ipri2013/master

AngularJS