added feature
fixed merge conflicts
angular ajax works, but we should have another look at it
fixed merge conflicts