* Added Backups and restore
Added restore

Conflicts:
	www/js/app.js
	www/js/controllers.js
	www/js/services.js
	www/templates/settings.html