Merge pull request #18 from guozhaonan/master

Added in Location and an interesting if condition for view home page
Added Location to Event