Licensing and Upgrade functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	fence-plus-auto-assign-fencers.php
Only hook licensing functions in the admin.