Fixed conflicts, deleted editReqController, fixed up acceptancetest gui, got it to wokr
Merge remote-tracking branch 'origin/team1-dev' into team1-dev