added membershipType to user table
added membership exp
Merge branch 'master' of https://github.com/shaikezas/eventpool.git
fixed merge issue