Added form

Also changed the seed data.
Merge branch 'dandev'

Conflicts:
	CONpetence/app/controllers/conventions_controller.rb
	CONpetence/config/routes.rb