branding changes #1

Conflicts:
	app/lib/router.js