fixed
Merge remote-tracking branch 'origin/newconf' into newconf

Conflicts:
	.gitmodules
fixed