Merge branch 'master' into sev/weapon_panel_retry
authorMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)

Trivial merge