Merge remote-tracking branch 'upstream/master' into 20140709-join
wip
Merge branch 'master' into 20140709-join
finish new join flow ui wise
Merge remote-tracking branch 'upstream/20140709-join' into 20140709-join