Controller test for Conference#show
Merge pull request #169 from gopesht/fix_controller_test_for_splash

Controller test for Conference#show
Use a single entry for navigation branding:

Allow a view to override the brand (esp. for conference splash pages),
Use the app name link for the admin control panel,
use the conference short title for end user content within a conference,
fall back to the app name link.

Visually, there are two substantial changes:
(1) the conference title (or short title) serves as the brand when viewing
conference content;
(2) the short title isn't shown redundantly on the navbar and the top of the
sidebar when editing a conf.
Merge pull request #175 from bear454/yield-nav-listitems

Use a single entry for navigation branding:
Conditional rendering of splash navbar
Added description to conference and program segment to splash

removed id from program partial