added documentation and additional TODO's for feature definition
Merge branch 'develop'