Added static content
Several tweaks and fixes
Added initial_data fixture with Site info
Merge branch '17-main-content' into develop