fix merge config bug. use mix instead.
Merge branch 'master' of https://github.com/songxc/sideNav
Merge pull request #2 from kissygalleryteam/master

fix merge config bug. use mix instead.
Merge pull request #3 from songxc/master

Auto merge by kpm server