license update
Merge branch 'master' of https://github.com/EEXCESS/wordpress-plugin

Conflicts:
	eexcess-functionality.php