fix both conf and xml and also expand PROJECT_DIR to
Merge branch 'master' of https://github.com/k-okada/hrpsys