Saving It Next Generation 1.0.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	update.txt