Bibibi editted.
Merge branch 'master' of https://github.com/transfloor/main

Conflicts:
	test00/test00.xcodeproj/project.pbxproj