Merge branch 'devel'
Merge branch 'devel'
syntax error in sql query