Branding
Merge branch 'master' of https://github.com/nlaplante/syslogng-web.git

Conflicts:
	app.js