Merge remote-tracking branch 'origin/master'

core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php

core/Config.php

core/DataTable/Map.php

core/Metrics.php

core/Plugin/Controller.php

core/Site.php

core/Translate.php

core/View.php

lang/en.json

libs/angularjs/LICENSE

libs/angularjs/angular-animate.js

libs/angularjs/angular-animate.min.js

libs/angularjs/angular-cookies.js

libs/angularjs/angular-cookies.min.js

libs/angularjs/angular-csp.css

libs/angularjs/angular-loader.js

libs/angularjs/angular-loader.min.js

libs/angularjs/angular-mocks.js

libs/angularjs/angular-resource.js

libs/angularjs/angular-resource.min.js