Merge branch 'master' into balloon

Conflicts:
	CHANGES.md
Update balloon styling and placement.
Merge remote-tracking branch 'origin/balloon' into dataSourceBrowser
Merge branch 'dataSourceBrowser' into uberbranch