dev
Merge https://github.com/xoperator/ChangePot

Conflicts:
	.gitignore