post merge: if a page does not have a primefaces component on it, it must use the mainTemplateJQuery.xhtml template instead of the mainTemplate.xhtml template
Merge chuck into nick
nick - removed file upload
nick - rando changes
Yeah