config
local changes (to be removedà
Merge branch 'master' of github.com:hleclerc/Soda

Conflicts:
	new/Soda.creator.user
	new/src/Soda/InstallDir.h