adds conference landing settings for confAdmin
adds module activation on conference#show page CONFDECK-56
fixes conference controller
Merge branch 'development' into confdeck-56

Conflicts:
	app/controllers/conferences_controller.rb
Merge pull request #30 from kodgemisi/confdeck-56

Confdeck 56