fix django 1.5 bug
Merge pull request #2347 from dimagi/ex-fix

fix django 1.5 bug
Add GetParamsMixin

Re-use this.  Why isn't this on the base class?
Merge pull request #2350 from dimagi/filter_mixin

Add GetParamsMixin
pass in sessionid explicitly to YUI uploader

get around Django 1.5 change to use HttpOnly cookie for session
Merge pull request #2354 from dimagi/hotfix-multimedia

pass in sessionid explicitly to YUI uploader
make email option opt-in and checked by default
Merge pull request #2355 from dimagi/reg

make email option opt-in and checked by default
Merge branch 'master' into OPM-reports
restored test data from master