Merge branch 'PCASME'

Conflicts:
build/ng-sharepoint.js
build/ng-sharepoint.min.js
build/ng-sharepoint.sharepoint.templates.js
Partial Merge
Partial Merge
Partial merge