Latest QueryCtrl code with validation for dataQuery and default empty query
Merge branch 'yo-pinz' of https://github.com/integrityapplications/pinz into yo-pinz
Merged up to date QueryCtrl into the modal view version.  Will only update QueryCtrlModal from this point on.