Initial commit
moved in gradle build
fixed conflicts and removed dependecies