Edit profile almost done

Added validation to all fields
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/scripts/controllers/editProfileCtrl.js