Merge PROP/master

Conflicts:
	.gitignore
Merge PROP/master

Conflicts:
	.gitignore