Dirty commit to transfer stuff to new computer
Merge branch 'master' of github.com:alicexigao/wisdomOfCrowds

Conflicts:
	packages/woc-server/common/data.coffee