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