Include workbench media and access in make
Dont depend on workbench_access
Add libraries to make file
Add kle to group in contentpage
Rename machinename for contact
Add CKEditor to make file
Add esdh fields to contentpage type
Merge branch 'master' of github.com:OS2web/os2web_base
Fix machine name on esdh fields. KLE is not required
Shrink machine name to under 32 chars. esdh fields
Merge fix
Merge fix
Merge branch 'develop'

Conflicts:
	os2web_base.features.field.inc
	os2web_base.info
	os2web_base.make
Merge branch 'develop'

Conflicts:
	os2web_base.make
Merge branch 'develop'

Conflicts:
	os2web_base.make
Merge branch 'develop'
Merge branch 'develop' into release-1.0

Conflicts:
	os2web_base.field_group.inc
Merge branch 'release-1.0'
Merge branch 'develop' into release-1.0.1
Merge branch 'release-1.0.1'