Reindent

Since it was a god awful mess. tw=2, sw=2, et;

au BufNewFile,BufReadPost *.js setl shiftwidth=2 tabstop=2 softtabstop=2 expandtab

Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/gertvv/mcda-elicitation-web

* 'master' of https://github.com/gertvv/mcda-elicitation-web:
  Make results display robust to order
  Post full MCDA problem as JSON, report errors

Conflicts:
	js/elicit/ElicitationController.js
	js/services.js
Ignore vim swapfiles
Use mocks for $scope

- Add angular-resource
Mock $httpBackend for DecisionProblem