fix app.js & project.controller.js

Created by: katjaq

fix app.js, fix project.controller.js, update webpack-cli in package.json, fix merge conflicts in atlasmaker-ws.js, in mri-page.js, in project-page.js, in project-settings-page.js, in ui.css, in twoWayBinding.js