working on q13es
Merge branch 'master' into q13es

Conflicts:
	src/h4il/settings.py
work in progress - added q13es, working on user registration
updated requirements.txt
added FillFormView
removed logging