More fixes for mixed type queries.
Fix typo.
Fix name collision auto-triggering widget function
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
Convert locations for cap export.
LK: realm_entity fix, more stats_demographic_data
Merge pull request #810 from ptressel/cap_area_export

Convert locations for cap export.
Start migration to doc_document (UI to follow).
CAP: uppercase prep folder, step on parser progress
Merge branch 'master' of git://github.com/nursix/eden
Don't override custom submit buttons with s3.cancel
CAP: lang should be en-us, RSS Parser completed