Merge pull request #1 from RootCauseSIF/django

Merging with RootCause
Adding Captcha to registration
Merge branch 'master' of https://github.com/RootCauseSIF/portal into RootCauseSIF-master

Conflicts:
	requirements.txt
Merge branch 'RootCauseSIF-master' into django
Merge pull request #29 from mnadig/django

Adding captcha to registration page