Added .project and .classpath files
Merge remote-tracking branch 'origin/master'