blab
composer issues
Start of angular/restangular implementation
Rebuild with composer install / update before proceeding
Composer.lock / composer.json
Included angular as tree in application.js, set up annotation of angular variables with [[variable]] in order for it not to conflict with blade. Angular application is setup as dataRetrieval, now starting with controller for result view
Update composer.json

Deleted soapbox and way duplicatoin.
Double php dom parser. Remove way generator
Revert "Included angular as tree in application.js, set up annotation of angular variables with [[variable]] in order for it not to conflict with blade. Angular application is setup as dataRetrieval, now starting with controller for result view"

This reverts commit 160e3b4b0a16972fb02f1f26d89d8d70f982e5bd.
Revert "Update composer.json"

This reverts commit 8da1e541278fa2ae6606cc346fd2ef36bafb5931.
Delete asd.txt
Another composer.json issue, niceee
merge finished
Added angular app and controller for restangular, communicating with api. Outline of API v3 made.
pre merge, no changes
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into arne
merge jelle -> arne. More or less working
formbuilder kind of integrated, early test version