Merge branch 'dev' into 'master'

nodemon.json

package-lock.json

package.json

src/resources/activity/activityControllers.js

src/resources/activity/activityDocs.yml

src/resources/activity/activityModel.js

src/resources/activity/activityRouter.js

src/resources/application/__tests__/applicationFuncTest.js

src/resources/application/__tests__/applicationPermTest.js

src/resources/application/applicationControllers.js

src/resources/application/applicationDocs.yml

src/resources/application/applicationRouter.js

src/resources/attendance/__tests__/attendanceFuncTest.js

src/resources/attendance/__tests__/attendancePermTest.js

src/resources/attendance/attendanceControllers.js

src/resources/attendance/attendanceDocs.yml

src/resources/attendance/attendanceModel.js

src/resources/attendance/attendanceRouter.js

src/resources/comment/__tests__/commentFuncTest.js

src/resources/comment/__tests__/commentPermTest.js