Merge branch 'integration'
new szenario for linux day
disabled software-link
Merge remote-tracking branch 'origin/master' into integration
fix: removed whitespeces in IDs
2014-05-07: typo in ldrewe dia fixed
Merge remote-tracking branch 'origin/integration' into mjuliano

Conflicts:
	config/knowledgebase-datasource-context.xml
	config/ldrewe.xml
Merge remote-tracking branch 'origin/integration' into mjuliano