deleted obsolete files
Merge branch 'develop'
formatting error message
Merge branch 'develop'