Merge pull request #51 from jpoon/master

Remove redundant build tasks
Changed .iml to *.iml in gitignore & removed comment in build.gradle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Production/build.gradle
Merge pull request #52 from yaronyg/master

Fix .gitignore bug (*.iml not .iml) and fix some minor comments