Misc Changes
Merge remote-tracking branch 'origin/master'
Added Life to MatchOverlay
Merge remote-tracking branch 'origin/master'