Merge pull request #1 from thomasmulvaney/master

Image aspect ratio is maintained while fitting to canvas
Fixed resize function when stretchToCanvas is false
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/imageBox.coffee