remove .DS_Store
update build.gradle
merge master