Feature#78 attribute types list prenesena

final merge with dev