Updated gitignore
updated .gradle
Merged from master