update YUI compressor to 2.4.8
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into a2zi
Merge branch 'master' into a2zi
pullAndMerge à la fin du script
Merge branch 'master' of github.com:A2Zi/Springbok-Framework
Merge branch 'master' into a2zi
Merge branch 'a2zi' of github.com:A2Zi/Springbok-Framework into a2zi

Conflicts:
	mergeFromUpstream.sh