Merge pull request #49 from gantry/staging

Merging staging into master for the live website
Merge pull request #53 from gantry/staging

Various fixes
Merge pull request #56 from gantry/staging

Deprecated Edit
Update parameter_chaining.md

-Changed the <param> elements to <fields> to reflect the new usage in 'template-options.xml'
-Changed 'templateDetails.xml' to 'template-options.xml' because <fields> elements only work in 'template-options.xml'.
Update setby.md

-Changed <param> elements to <field> to reflect current usage in 'template-options.xml'
Merge pull request #66 from ryangatchalian912/patch-1

Update parameter_chaining.md
Merge pull request #67 from ryangatchalian912/patch-2

Update setby.md
Merge pull request #68 from gantry/staging

Merging from Staging
Merge pull request #69 from gantry/master

Merging from Staging