xz
Merge branch 'devid' of http://github.com/alexdevid/eel into devid

Conflicts:
	composer.phar