deck view
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Views/header/headerView.js