Large Merge

Merged new gameplay featues (Bullets, Nametags, Health) into stable
build.