Merge pull request #301 from jshou/patch-1

* patch-1:
  add intellij files to Android.gitignore