json + version bump
Update lists_join wiki
Update lists_join wiki
Update lists_join wiki
Merge branch 'master' into colors_menu

Conflicts:
	utils/version