Update# add coc and cfp link
Merge branch 'master' of github.com:sitcon-tw/2015