changes tranfered from master to technology

Ship, Character, changes to Dao- and Control-Classes