added description of Takelab features to paper
resolved conflict by merging bib files