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
Added first iteration for VCard support
Added connection call before use
Added test container for testing VCard retrieval
Added helper for new VCard methods on Comms
Edits to display vcard avatar image
Added testing for null avatar
retrieve vcard for display
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec
Fixed bug on disconnecting from service
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec

Conflicts:
	android/client-frwk/SocietiesAndroidApp/assets/www/javascript/pagespecific/login.js
Updating primefaces theme
Creating a showcase page to ensure all the components are covered
Added avatar image to the friend profile page