initial revision of icwsm2013 branch
null merge of initial icwswm2013 branch to make future merges work