Merge branch 'master' into beta

Conflicts:
	api/controllers/IssueController.js
	api/models/Calendar.js
	api/models/Feedback.js
	api/models/Issue.js
	api/models/Laptop.js
	api/models/LaptopAssigned.js
	api/responses/forbidden.js
	api/responses/serverError.js
	assets/linker/js/render.js
	config/404.js
	package.json