Add default term detection
Merge commit '51dbaaba60c6f1615f21df29e08818d5bc7072da'

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.tem.html
Merge commit '5c3456da7d649200f37180c1fafef4bf359cd076'
Merge commit '5b7866ac152cc6a8fbcbe5016cedb7d339916aa3'

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.tem.html