Fixed items prefabs
Stage 3
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F

Conflicts:
	UnityProject/Assets/Prefabs/Blocks_1blue.prefab
	UnityProject/Assets/Prefabs/Blocks_1green.prefab
	UnityProject/Assets/Prefabs/Blocks_1red.prefab
	UnityProject/Assets/Prefabs/Blocks_1yellow.prefab