Working on the configuration for the lazy loading of the singletons.
Merge branch 'master' of https://github.com/RomainLo/Typhoon

Conflicts:
	Typhoon.xcodeproj/project.pbxproj