Merge branch 'master' of https://github.com/MAD-Studio/IPS

Conflicts:
	.gitignore