merge lyman_branch
add join and change to profile storyboard
resolve conflict, but the Main_iPhone storyboard has static cell issue
enhance the join page
resolve conflict about main storyboard
Merge branch 'jason_branch' of github.com:eventchat/client into lyman_branch
add join event function
Merge branch 'jason_branch' of github.com:eventchat/client into lyman_branch
merge conflict with master branch