objects, setQueries, handling char escaping
Merge branch 'master' of https://github.com/walker-clint/Group02SWE3613