Merge remote-tracking branch 'upstream/master'
changing icons and renaming folders, updating upstream fork
Merge branch 'master' of https://github.com/bravepickle/Dash-User-Contributions

Conflicts:
	docsets/Sphinx/icon.png
	docsets/Sphinx/icon@2x.png