update Manifest
Merge branch 'master' of https://github.com/tMizuhara/DroidCoupler.git
Merge branch 'master' of https://github.com/tMizuhara/DroidCoupler.git
Merge branch 'master' of https://github.com/tMizuhara/DroidCoupler.git
add resvDataSetting
Merge branch 'master' of https://github.com/tMizuhara/DroidCoupler

Conflicts:
	.DS_Store