Fixed bug in dual stack router click template
Merge branch 'reorganize' of github.com:XIA-Project/xia-core into reorganize