compose.phar updated
updates for winter term 2013/14
Merge branch 'master' of github.com:driehle/learnweb-crawler

Conflicts:
	composer.phar