Adaboost

This fixes conflicts with master, and should trigger Travis building process.