140405-iss002: remove .cproject and .settings
Merge remote branch 'origin/master'