CSS style changes so the IDs don't overlap
Added integration testing framework for the web app using Selenium
Some more tests - ensure we can navigate to the profile settings page
Beginning the Edit Profile page
Created a EE6 test webapp
Shoehorning in Java EE6 and JSF 2.0. Created a couple of example pages and controllers to demo to the team
Attempting to get OSGI + Spring + JSF to play nice together
Managed  to get OSGI + Spring + JSF to play nice together
Managed  to get OSGI + Spring + JSF to play nice together
Finished a prototype of the user preference display tree
Added popups to edit conditions and outcomes
- The popups don't work yet so I'm using panels
- The ok/cancel buttons don't actually do anything yet
Had to remove this reference to jquery - PrimeFaces uses its own version of jQuery which was conflicting. I'm not aware of this change affecting anything but if it is we'll need to work around
Wrote a few selenium tests around the Edit Profile Settings page, to ensure data displayed correctly and that dialogs function correctly
Added dialogs to add/edit/delete conditions and outcomes on the profile settings page

Expansions to the testing framework:-
- SQL scripts excute before and after the test to setup and clear down data (still need to invalidate the hibernate cache inside Virgo before this will work properly)
- Tests around new functions I added
Added code to allow creating of Preferences, Conditions and Outcomes
Expanding on the profile settings page
Adding tests surrounding Profile Settings page
(Plus some small modifications to selenium testing framework)
Various bugs found in other components, fixed as instructed by Eliza
Adding tests surrounding Profile Settings page
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	platform-infrastructure/web-app/pom.xml