Merge origin/master

Conflicts:
	web/images.jpg
Merge origin/master

Conflicts:
	web/images.jpg