Added ng-tags
Merge remote-tracking branch 'origin/master'