integrated character.png as main spritesheet.
Merge branch 'master' of https://github.com/DebateClub/DebateClub

Conflicts:
	Assets/scene.unity
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/guidmapper