fix some issue with the lican module
fix usage of the software entity resource
Merge remote-tracking branch 'refs/remotes/origin/angular' into angular