merge siteconfig
Merge branch 'points' of https://github.com/jintrone/XCoLab into points
Merge branch 'points' of https://github.com/jintrone/XCoLab into points
Merge branch 'points' of https://github.com/jintrone/XCoLab into points
Merge branch 'points' of https://github.com/jintrone/XCoLab into points
Merge branch 'points' of https://github.com/jintrone/XCoLab into points
merge