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
Add DataTypeUtil Class in External API (+ unit tests) to Manage
Societies Data Hierarchy
Wrote a few selenium tests around the Edit Profile Settings page, to ensure data displayed correctly and that dialogs function correctly
changed from hardcoded wrong paths, to relative correct ones
dropping bit 1096 CPA into pickup should now work with the fullcontainer virgo startup plan
Move Android code to root
Override .gitignore setting for *.properties
added override for Android projects
removing (unused) CISComms Factory references from DA Webapp