first step torwards generic unit types
generic units are working
Merge remote-tracking branch 'origin/master'