Merge branch 'feature/player' into dev
Merge branch 'dev' of https://github.com/CenterForOpenScience/modular-file-renderer into feature/image_export
Added docx renderer support
Player Export:

Add image exporters
Add export view for player
Add more base functions to mfr.__init__
Merge pull request #35 from alexschiller/feature/image_export

Feature/image export
Minor changes, began adding code renderer support
minor changes and began adding code renderer support
Merge branch 'dev' of https://github.com/CenterForOpenScience/modular-file-renderer into feature/docx

Conflicts:
	previewer/main.py
Merge branch 'feature/docx' into dev