Split --config-{dir,path} into --user{config,data}-{dir,path}
documentation about --user{config,data}-{dir,path}
Add --data-path option
Merge branch 'master' of github.com:wesnoth/wesnoth-old