Composer Update
Merge branch 'master' of https://github.com/alairock/Composer-AtomEditor

Conflicts:
	package.json