angular working
merging
Merge branch 'master' into angular
filter almost works
merging