SQL + XSS injection fix
Merge branch 'master' of https://github.com/yunasc/tbdev