added model-behaviour. fixed controller. added tests
merged taxon-fix