More fixes for mixed type queries.
Fix typo.
Fix name collision auto-triggering widget function
LK Template
Minify
Merge pull request #808 from michaelhowden/master

LK Template
Minify
Mixed queries: add missing test, fix case, and remove the case (since invalid in the controller)
LK tweaks
LK stats_demographic_data
LK: disable record_approval for Orgs, Allow Users to see
stats_demographic_data
minor correction
Merge pull request #809 from coder006/test

minor correction
Merge https://github.com/flavour/eden into masterLocal