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