fixed and resourcified comments
Merge branch 'develop'