Updated intro, added funnel link
Merge branch 'flat-design' into 2014-eventframe
Get changes from flat-design branch