notification changes
Merge remote-tracking branch 'origin/master'
filter design changes, registration form error fixed, new notification count fixed
conflicts merged