fixed Upgrading, fixed copy of cheat-sheet

Conflicts:
	Makefile.in