adds appeal type editing to conference
Merge pull request #24 from kodgemisi/confdeck-65

adds appeal type editing to conference
adds WYSIWYG editor to conference#email_templates
adds preview button to conference#manage
Merge pull request #25 from kodgemisi/confdeck-67

adds WYSIWYG editor to conference#email_templates
Merge pull request #27 from kodgemisi/conference-dashboard-sidebar

updates conference#manage sidebar links by adding groups
Merge branch 'development' into confdeck-58
renames Preview Conference Page to Open Conference Page
Merge pull request #29 from kodgemisi/confdeck-58

Confdeck 58
Merge branch 'development' into confdeck-56

Conflicts:
	app/controllers/conferences_controller.rb