add versions
use 14.04 as base
no more ONBUILD
No more ONBUILD (manually merge from master)