branding changes #1

Conflicts:
	app/lib/router.js
Merge pull request #68 from Heydon/feedback-merge

branding changes #1