x
Merge branch 'master' of https://github.com/mateifl/djsocial
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/mateifl/djsocial
more work on location and events display