Working on Events feature
 Fix merge issues
 Fix merge issues
Working on user account management.