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

Conflicts:
	IAA_HA/src/spring-config.xml