Merge branch 'master' of https://github.com/personanna/jnp

Conflicts:
	mysite/jnp/views.py
	mysite/mysite/settings.py
	requirements.txt
Merge branch 'master' of https://github.com/personanna/jnp

Conflicts:
	mysite/mysite/settings.py