remove missing submodule
Merge branch 'develop'

Conflicts:
	.gitmodules
Merge pull request #1 from Zomxilla/master

??