Ping OK
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	build/CEGUI.log