finished with cropping images
Merge branch 'master' into crop_done

Conflicts:
	app/assets/javascripts/jquery.Jcrop.js
	app/assets/stylesheets/jquery.Jcrop.css