Merged Android App and WebService using submodule