v1.1.1
Merge remote-tracking branch 'origin/master' into Stashy.Menu

Conflicts:
	dist/css/Stashy.css
	dist/js/Stashy.js