Stupid fix for composer.json file - license was incorrectly specified.
Now the composer.json file will validate correctly
Merge branch 'license-fix'
Adding .idea/ folder to git-ignore, changing the vendor entry
Merge branch 'master' into gui-changes