* new feature
Merge branch 'mynewfeature' into devel