added all code for java admin a[[lication and updated .gitignore
cleaned git cache for .gitignore problem
resolved conflicts