added composer.json
ignore .idea dir
Merge branch 'master' into dev