修正なし？

コミット
Merge branch 'akamatsu_changed_by_Miyamoto' of https://github.com/smalab/Einstein into akamatsu_changed_by_Miyamoto

Conflicts:
	akamatsu/EinsteinUITest/Assets/script/cell.cs
	akamatsu/EinsteinUITest/EinsteinUITest-csharp.sln
	akamatsu/EinsteinUITest/EinsteinUITest.sln
	akamatsu/EinsteinUITest/EinsteinUITest.userprefs