ignore .settings
move project to directory 'src'
move project to src
Merge branch 'develop'
remove .settings
fix conflict