picojson json library
name generation reworked
refactor
name generation redone, final touches
Merge branch 'master' into loadable-skills

Conflicts:
	player.cpp