Push/Pull
Merge branch 'master' of https://github.com/dpschupp/eeditions

Conflicts:
	cpanel.php