Merge branch 'whitelist' into settings

Conflicts:
	uninstall.php
Merge branch 'settings' of github.com:h5p/h5p-wordpress-plugin into settings