Images

A mashup of commits on both client and server which better support image cropping and template display.