Formatting code to be CheckStyle-compliant. (PECAS-76)
Merge branch 'feature-codecleanup' into develop
Merge branch 'develop' of https://github.com/SANDAG/PECAS.git into develop