Merge branch 'master' of github.com:uzuzjmd/Wissensmodellierung

Conflicts:
	competence-gui/competence-webapp/src/uzuzjmd/competence/gui/client/competenceSelection/CompetenceSelectionPanel.java
improved daolayer