added title for tab trigger
Merge remote-tracking branch 'upstream/master'
Increased max skills from 30 to 40
Merge remote-tracking branch 'upstream/master'
Update user schema (to avoid cherry picking)
fixed autocomplete issue related to switching the programming language
Merge remote-tracking branch 'upstream/master'
Merge pull request #1249 from dkundel/master

Autocomplete fix
Added shortDescription
Merge branch 'master' into employer-redesign

Conflicts:
	app/schemas/models/user.coffee