Merge branch 'wdat2-develop' into phippo
DataAPI: bug fixed with user objects
completing neo-templates
DataView: select on click
Merge branch 'phippo' into stoewer