Sync
Merge remote-tracking branch 'origin/master'

Conflicts:

	meanjs_admissions/meanjs-mean-2c319c5/app/models/application.server.model.js

	meanjs_admissions/meanjs-mean-2c319c5/public/modules/applications/views/edit-application.client.view.html
Merge fix
Merge branch 'master' of https://github.com/Admissions/Student_Front-end

Conflicts:

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