.gitignore update
marging .gitignore update
Gradle config updated
Code reforma + minor changes
Formating unified