updated jsp var names
updates to layout and file upload functionality
Merge branch 'master' of
https://github.com/davidhickeyicfi/orbis-portlets

Conflicts:
	orbis-consult-portlet/docroot/portlets/generalQuestion/question.jspf