Moved files to webapp/resources/ folder
Changed IDs so the example test can actually pass
Added option to select service when creating preference, and ctx attribute type from a list when creating a condition
Merge branch 'development' into paddy_webapp

Conflicts:
	api/java/external/src/main/java/org/societies/api/context/model/CtxAttributeTypes.java
Creating XHTML pages from JSF
Creating XHTML pages from JSF
Merge remote-tracking branch 'origin/development' into development
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development