update corehq
update corehq (multimedia)
Merge branch 'master' into app-sidebar
Merge pull request #185 from dimagi/app-sidebar

App sidebar
update submodules: app builder redesign
update corehq
hotfix vellum
updating settings for referencing context processors and setting dict for analytics
removing no longer used properties
updating documentation in example
Merge branch 'master' into hq_analytics_js

Conflicts:
	submodules/core-hq-src
Merge pull request #186 from dimagi/hq_analytics_js

Hq analytics js
update egenix-mx-base to 3.2.6 (3.2.5 was deleted)
updating realstaging fab deploy to force you the fabber to set a code branch when deploying. this doesn't affect other deploy targets
Merge pull request #187 from dimagi/egenix-mx-base-version

update egenix-mx-base to 3.2.6 (3.2.5 was deleted)
fixing staging branches back to master, removing s2 urls stuff, my bad.
Merge pull request #188 from dimagi/hq_analytics_js_hotfix

Hq analytics js hotfix
update submodule ref to corehq
update submodule ref to hqstyle
merged with master
update submodule ref to dimagi-utils