Merge pull request #1 from divio/develop

updating fork from master
fix for setting inheritance on a page
temp reverting #2606 change as it is blowing up
removing the spaceless tags as it mucks with html output
Merge pull request #2 from daegun/removeSpaceless

removing the spaceless tags as it mucks with html output
Merge pull request #3 from divio/develop

merging main fork into personal fork
merging main develop branch to test
Merge pull request #5 from daegun/test

merging main develop branch
reverting temp import module change
adding tests
Merge pull request #2731 from daegun/fixInheritance

Fix inheritance