Started on a concept for the front page
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	demos/frontpage.html
Frontpage 2