bug fixing
Merge branch 'master' into todo-edge
more ui stuff, moving to angular filtering