adapt to new height of header
Merge branch 'dev' into Ark
Merge branch 'dev' into Ark

Conflicts:
	TODO.md
Add social feature.
Add URL
Merge branch 'Ark' into dev