Reverted the default template to the old jquery version (for the time
being).
We
will upgrade this once we are confident it works on all pages.
Merge branch 'master' of https://github.com/the-fascinator/the-fascinator
Added missing new dependency for JFreeChart
Merge branch 'master' of https://github.com/the-fascinator/the-fascinator

Conflicts:
	portal/pom.xml