5
Merge remote-tracking branch 'origin/master'

Conflicts:
	BigPicture.tga
6
7