Merge branch 'PCASME' into Pau

Conflicts:
build/ng-sharepoint.js
build/ng-sharepoint.min.js
build/ng-sharepoint.sharepoint.templates.js
Config, Folder and User services