Add .idea to git ignore list
Merge branch 'branch-v1.4.1' of github.com:EnterpriseManagementInc/bigbluebutton_rails into branch-v1.4.1