Added the ability to use shortcodes inside the page content, in addition to using them in template
Fixed intentation and formatting issues that were caused by the previous commit
Added shortcodes to include page content inside templates