[CHANGE] Updating build.gradle and iml
Merge branch 'gradle'