Support for Billings Pro Server Admin
Merge branch 'billings-pro-server-admin' of github.com:iloveitaly/mackup into iloveitaly-billings-pro-server-admin

Conflicts:
	CHANGELOG.md