deleted unused manifest
deleted useless iml
Merge remote-tracking branch 'origin/master'