Merge branch 'master' into Adar
visual: put values from db
default theme
Merge branch 'Adar'