Merge functionality in board data

ability to merge local board data data with data from other source,
(no ui for this yet)
fixing syntax error
another one
Refactoring Flowdatagrid
refactured flow data to angular
Merge pull request #8 from paddelkraft/dev-branch

Dev branch