ignore that
Merge branch 'master' of https://github.com/pierreguillot/KiwiLibrary

Conflicts:
	Application/Builds/MacOSX/Kiwi.xcodeproj/project.xcworkspace/xcshareddata/Kiwi.xccheckout