Housekeeping:
* add data- to ng-
* Merge conflicts from remote.
Merge branch 'master' of gh:/volusion-angular/vn-toolbox-common