base activitity completede working on like unlike
conflict resovled
before merge to khushbuwork
Merge branch 'khushbuwork' of https://github.com/xavoctechnocratspvtltd/xsocialApp into vijaywork
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xsocialApp into vijaywork
Merge branch 'master' into khushbuwork
Activity lister changed to simple view .. like functioning to be checked and worked now
Merge branch 'rakeshwork'
Merge branch 'master' into khushbuwork
Added Plugin to authenticate system and working on like button
modified login & register View
conflict Resolved
included untracted files in master
conflict resolved
Update Register Process via MVC Pattern