Merge dev-master
fix filters
1
2
form label
fix form label
2
3
e
1
w
1
d
translation
Merge templating
handling messages