Removing text editor backup file
updated composer.json
Merge branch 'master' into hackathon