Merge branch 'funnel-bs3'
Merge branch 'master' of https://github.com/hasgeek/funnel
Merge branch 'master' of https://github.com/hasgeek/funnel
use MarkdownField in proposal form