Here goes nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	meanjs_admissions/meanjs-mean-2c319c5/config/env/all.js