bug de query
bug
Merge branch 'master' of https://github.com/bostak/framework into Samuel