Change some notifications haml code params
Merge remote-tracking branch 'upstream/master'