Merge pull request #10 from BKcore/tibo-ui

Update live feed and home and events
trending topic
events API
Merge pull request #11 from picsoung/nico

Nico
Merge branch 'master' of github.com:BKcore/BattleHack2014 into tibo-ui

Conflicts:
	src/events.html