Updated .gitignore to ignore .idea folder.
Updated to 2.4 version.
Merge branch 'v2.4-latest'