# Conflicts:
#	src/main/resources/public/index.html
#	src/main/resources/public/js/angular.js
#	src/main/resources/public/js/app.js
#	src/main/resources/public/pages/timesheet/timeSheetController.js