Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist

Conflicts:
	h5p-php-library
Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist
Merge branch 'user-results' into whitelist

Conflicts:
	h5p-php-library
Merge branch 'master' into whitelist
Merge branch 'whitelist'