Merge branch 'bootstrap3' of https://github.com/getsentry/sentry into getsentry-bootstrap3

Conflicts:
	src/sentry/event_manager.py
	src/sentry/templates/sentry/plugins/bases/tag/widget.html
	src/sentry/web/frontend/groups.py