fixed merge conflict
updated w2p version checks for install
removed php ver check as already covered in valid w2p install
Merge remote-tracking branch 'origin/master'