SqlBuilder new fields: country, language, city
Merge branch 'develop_sqlbuilder' into develop