Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev
changed the way images load in explore
Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev
friend profile is working again but frank is gone from dev so his profile crashes?
polised up social view
friend profile changes
Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev
stuff
Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev
added useful and funny button activity in feed
schlong
merge issues resolve
changed keys to make push work
Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev
removed follow button if it is yourself
top rated in popcorn has correct rating now
work in progress
fixed some memory leaks
stuff
Merge branch 'dev' of https://github.com/joshuabell/popcorn into dev