Merge master
Merge remote-tracking branch 'rumel/master'

* rumel/master:
  Remove unnecessary things
  Ignore .idea
Merge remote-tracking branch 'zhen/master'