remove cirlce action in skill detail page
remove circle selection
refactor service to adapt to new json technical term model
Merge commit '51dbaaba60c6f1615f21df29e08818d5bc7072da'

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.tem.html
Merge commit '5c3456da7d649200f37180c1fafef4bf359cd076'
merge code from Phuong and make responsive for sign in page
refactor the service in order to adapt to new JSON model
Merge commit '5b6f645f28b96b21b380d0643356449120a6cde8' into new_json_model
Merge branch 'master' into new_json_model

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.tem.html
Remove the circle in the analytics skill template
add register page
Merge branch 'master' into new_json_model
Merge commit '5b7866ac152cc6a8fbcbe5016cedb7d339916aa3'

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.tem.html
Merge commit 'fc0385c3e68dc81f130f283ca6b41b7d6cf0a569' into new_json_model
Merge commit '0719dc0e48bd833362b0b03470b7a20c5fde2255' into new_json_model
Remove redundant method from count service
Merge commit '0719dc0e48bd833362b0b03470b7a20c5fde2255'
Merge commit 'fc0385c3e68dc81f130f283ca6b41b7d6cf0a569'
Merge branch 'master' into new_json_model
Inject json resource into test configuration class