Merge with proper DevTools
Merge branch 'upgrade' of github.com:breach/exo_browser into upgrade

Conflicts:
	NOTES