updated submodule reference
Merge branch 'master' into wamp_tmp

Conflicts:
	fuel/packages/ratchet