Jelly
Merge remote-tracking branch 'origin/master'

Conflicts:
	Angel's Tale/res/img/mugshots.png
Jelly