implementing image crop
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/uploads/styles/custom.css