display popup view for facebook login
Reorg + settings for trends/search
Merge remote-tracking branch 'upstream/master'