added crop view controller
Merge branch 'trunk'
Merge branch 'master' into trunk
fix aspect ratio
Merge branch 'master' into trunk