Baystation12/Baystation12 — pull request #2934 by NicholasDV (2013-06-01 04:06:18+00:00)
Title: Updating BEF with master, again! 

Updating BEF with master.

Asanadas decided to merge in some sound changes towards master. They need to be mirrored to BEF, so here we go. :/