フォルダ階層変更したお
Merge branch 'master' into Takuya

Conflicts:
	ScrollAndPickUp/proj.android/assets/blocks.png
	ScrollAndPickUp/proj.android/assets/blocks.png~HEAD
	proj.android/assets/blocks.png