Changed the syntax for including parts

And added .shtml (server html) support.
Merge from develop to master

Major syntax change and added .shml support.