testing a change for image processing related to memory
returning image to avoid ensure error
Merge branch 'master' into rails4
updating to rails 4.1 dependencies