Clean master
Merge branch 'dev'

Conflicts:
	composer.json
	lib/NetVerify.php