Database Schema Fix

Grunt should be happy now. Just a couple of naming issues in
application.server.model.js. All other changes pertain to articles and
should be irrelevant.  It should go without saying, but never commit
code that doesn't work.
Merge remote-tracking branch 'origin/master'

Conflicts:

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