removed files that are not used
merge branch 'develop'

moving changes