Merge remote-tracking branch 'origin/master' into dev/i18n/merge
Add David as keynote
padding after fui-user
en schedule
language tags for talks
schedule with flexbox for responsive (demo)
flexbox schedule (not beautified)
fixes speaker chinese name from "坡" to "波"
Merge branch 'dev/i18n/merge' into develop

Conflicts:
	app/styles/app.styl
	i18n/src/schedule.ls
fixes speaker chinese name from "坡" to "波"
list_en for environment track
Merge branch 'develop'

Conflicts:
	app/partials/schedule.jade