Delete xml configuration (annotation config works fine)
Merge branch 'feature'