trying to fix query 500 errors
Caused ESView.run_query to raise an exception on bad user input
I also made a new exception "ESUserError" for this purpose.  Subclasses
should catch this exception manually.
remove 'ts' from pip requirements install
don't install dev-requirements on travis
small correction to scripting uploader
Added BadRequestError exception to reports, and handling to return a 400 in the case of that error
Merge pull request #793 from dimagi/tsmask

'ts' hiding errors from pip requirements install
Merge branch 'master' of https://github.com/dimagi/commcare-hq into user_query_fix
config instructions
Merge branch 'master' into dynamicreports
Merge pull request #796 from dimagi/dynamicreports

self-merge due to documentation only change + removing dead code
added separate error message for bad querystring.  Feel free to change
Merge pull request #795 from esoergel/user_query_fix

Fix for bad user queries in reports
adding original filename+extension requirement for retrieving attachment urls 

sanity check/safeguard for j2me knowing how to grok an attachment stream (content-type on download might not be enough). requires casexml lib update
Merge branch 'master' into case_multimedia

Conflicts:
	requirements/requirements.txt
	submodules/mvp-reports
Merge branch 'case_multimedia' into staging2

Conflicts:
	requirements/requirements.txt