Mup Bug Fixes 3 - 17JUN2014 + Folder update

HoP Keycard Authentication device-majig