replace PIL with Pillow #448
Merge branch 'multi' of https://github.com/daonb/okqa into dev

Conflicts:
	requirements.txt
Merge remote-tracking branch 'daniel/multiple_entities' into dev
Fix #455: remove unused templates
Remove directory with typo
Add django-behave for BDD testing
Use Django Behave tests
Merge branch 'behave' of https://github.com/danielhers/open-shot into dev
naming things
writing tests