task+skill+skillCategory
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/adapters/application.js
	app/router.js