Ignore .idea folder (WebStorm project files)
Merge branch 'dev'