Avoid resque error
Merge pull request #155 from CruGlobal/MH-694

Refactor Permission scopes for Organization model
Merge pull request #156 from CruGlobal/MH-708

Redesigned Add bulk comment feature in group members page
Allow the facebook user to login using the existing email address
Merge pull request #157 from CruGlobal/MH-710

Allow the facebook user to login using the existing email address
Fix test error about the changes in facebook login
Refactor methods to consider organizaitonal_permission.deleted_at
Merge branch 'master' into dev
Merge branch 'MH-646' into dev