update 3-3-2013
Merge branch 'stage' of https://github.com/cwccwc/cwccwc into stage