added new content type
manyaly merged conflicts
Merge branch 'testing' of github.com:drupaldevel/vd into testing
Merge branch 'testing' of github.com:drupaldevel/vd into testing
Merge branch 'testing' of github.com:drupaldevel/vd into testing
manualy merged conflicts
added functionality for import
updated features
Merge branch 'testing' of github.com:drupaldevel/vd into testing