Merge branch 'try-to-fix-comment-filter' into 'master'

Simplify filter conditions - still not working in IOS

See merge request !373
4 jobs for 391-give-correct-icon-button-a-second-state-incorrect in 8 minutes and 44 seconds (queued for 1 second)
Status Job ID Name Coverage
  Codestyle
passed #160901
nodejs
tslint

00:02:13

 
  Test
passed #160902
nodejs
unit_tests

00:02:02

 
  Build
passed #160903
angular
ngbuild

00:04:11

 
  Deploy
passed #160904
git allowed to fail
sync_mirror

00:00:17