Fix bug
Merge remote-tracking branch 'origin/master'
Fix bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	STKUserViewController.m
	SportJoin/TimeLineTableViewProtocol.m
Merge remote-tracking branch 'origin/master'

Conflicts:
	SportJoin/TimeLineTableViewProtocol.m
Fix bug
Fix bug
Merge remote-tracking branch 'origin/master'
Fix time line
Merge remote-tracking branch 'origin/master'

Conflicts:
	SportJoin/TimeLineTableViewProtocol.m
Merge remote-tracking branch 'origin/master'

Conflicts:
	SportJoin/TimeLineTableViewProtocol.m