Merge

.../src/main/resources/webapps/cima/ManualConfiguration.html

...esbrowser/src/main/resources/webapps/cima/css/loading.css

...esourcesbrowser/src/main/resources/webapps/cima/js/app.js

...ser/src/main/resources/webapps/cima/js/controller/auth.js

...r/src/main/resources/webapps/cima/js/controller/device.js

...ser/src/main/resources/webapps/cima/js/controller/home.js

...er/src/main/resources/webapps/cima/js/directive/search.js

...rowser/src/main/resources/webapps/cima/js/service/auth.js

...wser/src/main/resources/webapps/cima/js/service/device.js

...rcesbrowser/src/main/resources/webapps/cima/js/url/url.js

...er/src/main/resources/webapps/cima/json/capabilities.json

...browser/src/main/resources/webapps/cima/json/devices.json

...rowser/src/main/resources/webapps/cima/json/goodjson.json

...rc/main/resources/webapps/cima/json/newformatdevices.json

...ser/src/main/resources/webapps/cima/lib/angular-jsonld.js

...rcesbrowser/src/main/resources/webapps/cima/lib/jsonld.js

...esbrowser/src/main/resources/webapps/cima/lib/jsonld11.js

.../src/main/resources/webapps/cima/lib/lodash-compat.min.js

...sbrowser/src/main/resources/webapps/cima/lib/ngstorage.js

...rowser/src/main/resources/webapps/cima/lib/restangular.js