Updated Likes and users objects methods to take in USERID
Merge branch 'beta'