fix membership.php conflicts
ui scs
Merge branch 'master' of https://github.com/cipri88/ws14secure