Reenable the different template views in result list
Resolved error during save of metadata when keyword in keyword combobox was empty
Merge branch 'master' into sigmaportal

Conflicts:
	web/src/main/webResources/WEB-INF/applicationContext.xml