testing jira
Merge branch 'master' of https://github.com/cmgranados/simplicity.git

Conflicts:
	kappa/requirements/views.py
	simplicity_main/urls.py
fixes merge