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

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