Fix stuff
Merge branch 'master' of github.com:jpulec/niteabout

Conflicts:
	requirements/prod.txt
Merge branch 'master' of github.com:jpulec/niteabout
Merge branch 'master' of github.com:jpulec/niteabout

Conflicts:
	requirements/common.txt
	requirements/prod.txt
Add modal