Fixed profile settings controller so that trees are not duplicated
Removed duplication of code
Tests surrounding Profile Settings Page
Uncommented section of a test
Merge branch 'development' into paddy_webapp

Conflicts:
	platform-infrastructure/web-app/src/main/webapp/includes/loginbox.xhtml
Merge branch 'paddy_preferences' into development
Updating PrimeFaces theme so that it is consistent with the rest of the webapp
Updated login box to use new primefaces dialog
Updating primefaces theme
Creating a showcase page to ensure all the components are covered
Updating primefaces theme
Creating a showcase page to ensure all the components are covered
Merge branch 'paddy_preferences' into paddy_webapp

Conflicts:
	platform-infrastructure/web-app/src/main/webapp/includes/loginbox.xhtml
Merge branch 'Enterprise_Pilot_1.0' into paddy_webapp
Deprecate old models so they're not used any more
Refactored notification code into its own controller, added a notification bubble and popup
Git is refusing to accept that I've renamed this file
Git is refusing to accept that I've renamed this file
Git is refusing to accept that I've renamed this file
Notification bubble count looks better right aligned
Made constants final
Finished AckNack, Radio and Checkbox GUI components for the notification popup
Finished AckNack notification popup - submit as soon as one of the option buttons is clicked