Diff local & github
Merge remote-tracking branch 'origin/master'

Conflicts:
	backup/INSTALL.txt
	backup/TODO.txt
	backup_server/INSTALL.txt
	backup_server/TODO.txt