Updates relevant for upgrade-all-libraries feature
Merge branch 'master' of github.com:h5p/h5p-php-library

Conflicts:
	h5p.classes.php