FLOE-193: Adjusted the styling of the top-bar

Modified the top-bar styling to more closely match that of the mockups.
Merge branch 'FLOE-193' into FLOE-194 and resolve conflicts.

Conflicts:
	demos/css/feedbackDemo.css
	demos/html/feedback.html