Adding screenhero
Merge branch 'screenhero' of github.com:iloveitaly/mackup into iloveitaly-screenhero

Conflicts:
	CHANGELOG.md