GF7680 revised delete disablement condition
Merge branch 'deploy-dev_build_git_03122014' of https://github.com/NCIP/cadsr-cdecurate into deploy-dev_build_git_03122014