Fixed submodules
Merge .gitmodules