xmas 2013

Signed-off-by: Martin Stone <martin@d7415.co.uk>
parser: Parse new dev scan format, with military centres.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 4bfbf8585cb2d463629c25d61c26d84cea71c1a3)