Update application directories
Update gitmodule dependencies
Update on merge