mergin
Merge branch 'frontend' of https://github.com/dkellis42/COdeWORK into frontend

Conflicts:
	app/controllers/users/users.profile.server.controller.js
	public/modules/users/controllers/settings.client.controller.js