Update example local settings
Add captcha urls
Add captcha to feedback
Remove test for adding feedback
Ups, miss to update requirements file
Add captcha to template
Change error message
Show form errors
Merge branch 'captcha' of github.com:Hackfmi/Diaphanum into captcha
Fix errors and values
Move line to right position
Join code
Merge branch 'captcha'

Conflicts:
	feedback/templates/feedback/add_form.html
	feedback/views.py