fixes issues on hqproxy0
Merge pull request #216 from dimagi/hqproxy0-fix

fixes issues on hqproxy0
Merge branch 'master' of github.com:/dimagi/commcare-hq into core-hq-mm-video-support
added default language property
don't be stupid with the form and module names when language is involved. sheesh.
Merge branch 'master' of github.com:/dimagi/commcare-hq into staging2
Merge branch 'core-hq-mm-video-support' into staging2