merge stephan

tryed to look on stephan's branch that is emtpty and get problems with egit