Merge branch 'Feature#78_AttributeTypesList' of /home/pro-group/RubyMineProjects/DataPoints with conflicts.