New Branch for website

Build has all changes made for the website
Should build into a war (not self executing to be launched in a jetty)