Images changed
Merge branch 'master' into clip

Conflicts:
	img/empty.jpg