Modifications to the license checks and storing. Updates to help fix the admin notice display issues
Merge remote-tracking branch 'origin/master'