complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/foto/3a.png
	res/foto/3b.png
complete