BZ-0000: Cleaning up facilityViewController code.
Merge branch 'noesispro_fd' of https://github.com/NoesisEnergy/bootstrap into noesispro_fd