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

Conflicts:
	CHANGELOG.md