Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:Seppone/QObjRec into develop

Conflicts:
	.gitignore