Something something

Somethingmoar
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/assets/sprites/Thumbs.db