Added user functionality
oops, too fast
Merge remote-tracking branch 'origin/master'

Conflicts:
	duarte-components/duarte-header.html