jcrop + paperclip
fixed crop offset
Merge branch 'AVATAR'

Conflicts:
	Gemfile
	db/schema.rb