Get rid of .iml files -- let Android Studio regenerate them.
Merge remote-tracking branch 'origin/master' into HEAD