Merge remote-tracking branch 'origin/team1-dev' into team1-release-it4
Merge remote-tracking branch 'origin/team1-release-it4' into team1-release-it4
Modified formatting in some files.

Signed-off-by: Arica Liu <aricaliu@wpi.edu>