merge
Merge branch 'master' of https://github.com/DominikSchniertshauer/KIS

Conflicts:
	ZY_SS14_T4_SAPUI5_KIS/WebContent/zy_ss14_t4_sapui5_kis/hospitalization_displace.controller.js