bump versions
merge tools with framework project so they are always in sync
workout a bit the annotations