ticket:1 setting&makefile fix
Merge branch 't1_contact'