Better 5.2 compatability
Adds WHMCS 5.2 to readme
Fixing merge conflicts