update
Merge branch 'master' of ssh://git@github.com/mpries/IAA_HA.git

Conflicts:
	IAA_HA/WebContent/search/searchPublicationResult.jsp
	IAA_HA/src/de/nordakademie/action/publication/PublicationEditAction.java