Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into TH-04

Conflicts:
	assets/Graphics/Characters/s_05.png
	assets/Graphics/Characters/s_06.png
	assets/Graphics/Characters/s_07.png