Android Studio update + Gradle update

additional gitignore files such as .iml and idea-stuff
fixed gitignore
fixed gitignore, again

Conflicts:
	.gitignore