Fixed inheritence
Merge branch 'bootstrap3' of github.com:CERN/apvs into bootstrap3