Fix merge conflicts
adds tests for NameJTextField class
adds tests DescriptionJTextFieldArea class.
Merge branch 'dev' of https://github.com/cs3733bdt/wpi-suite into EndOnTime