all queries updated
Merge branch 'master' of github.com:jmueller17/Aixada