deleting .idea
Merge remote-tracking branch 'refs/remotes/origin/MIU1303'