added logging and backup
Merge branch 'v-2.2'

Conflicts:
	app/views.py