PHOSDialog bug
Converted state in QMessageBox to a QString
UI Changes
Added som push buttons and did some minor cosmetic changes.
Preparing for merge
Preparing for merge.
Fixing merge error
Auto-merging phos_dcs_3.pro
CONFLICT (content): Merge conflict in phos_dcs_3.pro
Auto-merging mainwindow.cpp
CONFLICT (content): Merge conflict in mainwindow.cpp
Merge