Merge branch 'luke-work-2'

Conflicts:
iuvo/iuvo_app/views.py
delete unneeded backup file