change project run context path and default url
change gitignore. retrack .jar files
merge files