Splaspage: Add highlights. Fix cfp inclusion.
add event_type keynote
fix count in spec
keynote type available only to admins. Able to mark as highlight. Highlights and Keynotes scoped.
add include_cfp to splashpage, remove old column, migrate data
do not allow creation of proposal with keynote type
wording
show Keynote type in new proposal
Revert "do not allow creation of proposal with keynote type"

This reverts commit e103ea18b5e4fb0ddb82aaf9c058325d7e3daced.
Splaspage: Add highlights. Fix cfp inclusion.
add event_type keynote
keynote type available only to admins. Able to mark as highlight. Highlights and Keynotes scoped.
add include_cfp to splashpage, remove old column, migrate data
do not allow creation of proposal with keynote type
add is_keynote attribute to event_types
Revert "add is_keynote attribute to event_types"

This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740.

Conflicts:
	app/models/conference.rb
remove keynotes