Re-added Hello.js to gulpfile
Added logout-button
Merge branch 'master' of https://github.com/pixelpark/ppnet

Conflicts:
	app/scripts/controller/streamController.js
	app/views/partials/header.html
	app/views/stream.html