translating
Merge branch 'dev-master' into templating
#241: ru date control
#300: icon