Add .classpath, .settings to git.
Merge branch 'develop_matjazsu'