Merge web app and maven project