Added red borders to invalid fields
Removed commented out code
fixed import merge conflicts
Merge branch 'feature-red-borders' into team3Master