laurie header changed slightly
confict removed
conflicts removed
Merge branch 'static-pages' into develop