[merge] swgemu unstable 08OCT14

[cleanup] removed pre-mature CU armor template files
[cleanup] loos ends on objects