fix compile error on ubuntu 13.10
some refactor
fix
rm unused config item
Merge branch 'develop'