ignore
ignore
add new files
added files
change view to cropping img
added crop
Merge branch 'master' into trunk