Support for Poedit
Merge branch 'poedit' of https://github.com/bashu/mackup into bashu-poedit

Conflicts:
	CHANGELOG.md
Merge branch 'bashu-poedit't push origin master