restructure
add new icon
Merge branch 'master' into gh-pages

Conflicts:
	exports/ui/login-form@2x.jpg
update
clear
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	sketchFiles/colorSwitch.sketch/Data
update