fix sort-questions for 1.x apps
Merge pull request #244 from dimagi/app-manager-two-column

App Manager now uses proper template
update submodule refs to formdesigner and hqstyle
hotfix from sidebar layout changes
Merge pull request #308 from dimagi/fix-no-app-500

hotfix from sidebar layout changes
hotfix: change all .hidden to .hide
Merge pull request #309 from dimagi/hotfix-hidden-hide

hotfix: change all .hidden to .hide
fix 500 on building app with new form
Merge pull request #310 from dimagi/hotfix-form-version

fix 500 on building app with new form
fix hidden to hide class for a few things i missed
Merge pull request #311 from dimagi/hotfix-hidden-hide

fix hidden to hide class for a few things i missed
update-submodules
Merge branch 'master' into sort-questions

Conflicts:
	corehq/apps/app_manager/templates/app_manager/form_designer.html
	corehq/apps/hqwebapp/templates/hqwebapp/base.html
Merge branch 'sort-questions' into staging2

Conflicts:
	corehq/apps/hqwebapp/templates/hqwebapp/base.html