change col order in sql
Merge branch 'develop' of github.com:chocoteam/choco3 into develop