Major update

Lots of bug fixes.
StrapQuery template is 100% complete.
Major improvements almost everywhere.