Merge branch 'master' of github.com:dimagi/commcare-hq into feature-preview

Conflicts:
	corehq/apps/domain/urls.py
fix validation for software plan version form
apparently some versions have trouble installing line_profiler w/o explicit version

I think it's because they're all beta versions
Merge remote-tracking branch 'origin/feature-preview' into lab_case_prop_filter
Merge pull request #3121 from dimagi/explicit-line_profiler-version

apparently some versions have trouble installing line_profiler w/o expli...
Merge pull request #3106 from SEL-Columbia/FIX_MUAC_ACTIVEGAM

Fix muac for koraro
Merge branch 'master' of github.com:dimagi/commcare-hq into attrib-fixture
Merge pull request #2589 from dimagi/attrib-fixture

Fixtures with Attribute support
Merge branch 'master' into update_immunization
tweaks to cloudcare-as-web-user text

http://manage.dimagi.com/default.asp?107467
Merge pull request #3125 from dimagi/cloudcare-help

tweaks to cloudcare-as-web-user text
fix meta property for commtrack users
remove unused imports and meta declaration
sync south apps in post_migrate signal
fix cases__full key error
Merge pull request #3127 from dimagi/api-error

fix cases__full key error
Merge pull request #3126 from dimagi/south-design-docs

South design docs
Merge pull request #2990 from dimagi/feature-preview

feature preview framework
cache fixtures in couchdb
cache fixtures fix