Non-important Upload progress/changes
Mimetype
More non-important commits
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
Adding Universities "json"
Faculty View
Upload button update
Merge remote-tracking branch 'origin/master'

Everything should work. Probably.
Merge branch 'master' into security-dev

Conflicts:
	meanjs_admissions/meanjs-mean-2c319c5/bower.json
	meanjs_admissions/meanjs-mean-2c319c5/public/modules/core/views/home.client.view.html