Canvas Image Editing

Added canvas image editing. The image edits are done client-side via
the HTML5 canvas, base64 encoded, and sent to the server.
Merge branch 'master' of https://github.com/binoculars/modular-file-renderer into binoculars-master

Conflicts:
	main.py
	renderer/image/__init__.py
	requirements.txt
extra commit for missed files
Fixed conflicts and issues from merge
Merge branch 'master' of https://github.com/kah-odonnell/modular-file-renderer

Conflicts:
	main.py
	minimal-requirements.txt

Hotfixes for file _render() number of args issue
add test files
Merge pull request #25 from alexschiller/master

adding docx from kah-odonnell and other fixes