Merge branch 'release/0.4.0' into develop
Fixed the settings change in sentry
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	sentry_hipchat/models.py
Merge branch 'release/0.5.0'