Craft is a now a big usefull mess :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	craft/bundle.php
Craft is a now a big usefull mess :D