revert pod setting
Merge branch 'revert_pod' into develop

Conflicts:
	.DS_Store