BAC-106: better error handling in Phalanx UI
Merge branch 'bac-106-error-handling' into phalanx-redoux