Merge branch 'master' into develop
Minor improvements on legend window
	Add attribution to legend window
Merge branch 'develop'