minor
Merge branch 'beta'

Conflicts:
	Images/Thumbs.db
Merge branch 'beta'