Fixing .gitnore .iml issues. No need to track .iml. Changing build.gradle to SDK 19 instead of 20.
Merge remote-tracking branch 'origin/master'