merged with customSql
Merge branch 'master' of https://github.com/zenev/ClientCard