Mimetype
Merge remote-tracking branch 'origin/master'

Conflicts:

	meanjs_admissions/meanjs-mean-2c319c5/public/modules/applications/controllers/applications.client.controller.js

	meanjs_admissions/meanjs-mean-2c319c5/public/modules/applications/views/edit-application.client.view.html