address conflict
Update org.eclipse.jdt.core.prefs
Merge pull request #4 from lyg830/myCamera

address conflict