Add names and description.
Merge branch 'master' of https://github.com/fancyblock/shanghaigamejam2014

Conflicts:
	CuteCultivation/Assets/Scene/Game.unity