Fix merge conflict in 'package.json'
Move AngularJS-code to Client-repository