a few minor changes
track a new file under xcodeproj
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iosapp.xcodeproj/project.pbxproj
minor fixes
add support for image cropping
Switch back to the default image cropper with square frame
去除url调用
Merge Lei's Commit #3
Revert "Merge Lei's Commit #3"

This reverts commit 18c133f9e8940dd715faa4d6b90e3239aaed148f.
Merge Lei's 3# commit

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp.xcodeproj/project.xcworkspace/xcshareddata/iosapp.xccheckout
Merge Lei's 3# commit part2