progress...
Merge branch 'master' of https://github.com/tdubourg/velov-unchained
Merge branch 'master' of https://github.com/tdubourg/velov-unchained
sql and model work