Adjustings for Intellij IDEA
Modifing workspace
Fixing Conflicts with master
Modifing Pom