Merge pull request #19 from guozhaonan/master

Added Location to Event
Fb stuff to look at