added submodule
test
Merge branch 'develop' into test

Conflicts:
	.gitmodules