added 2 new apps :: features - Image features :: clustering - Image clustering
resolve conflicts