add backup
Merge branch 'feature/backup-117' into staging

Conflicts:
	Gemfile
	Gemfile.lock