merge develop, move website to root

1 job for !2 with init in 47 seconds (queued for 4 minutes and 29 seconds)
detached
Status Name Job ID Coverage
  Test
passed test #229084

00:00:47