repo cleanup
Merge branch 'master' of https://github.com/shanxu5/poop

Conflicts:
	.studio/caches/metadata_contents.xml