Added .idea folders.
Merge remote-tracking branch 'origin/master' into anlun_br

* origin/master: