comitted to resolve conflict
Merge branch 'master' of https://github.com/algosystech/collosys
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-1320 ng-table client side filtering
CLSN-1141 ng tags input
Merge branch 'master' of https://github.com/algosystech/collosys