clean .classpath .settings project.properties .project from master
clean .classpath .settings project.properties .project from master
Merge branch 'develop'
some modification
merge develop into master
fix view photo bug