refactor service to adapt to new json technical term model
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
Merge branch 'master' into new_json_model
Support unlisted terms
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
Add test case for new new refactored service
Reformat code, remove redundant code and modify Javadocs
Add term and skill into JSON for testing
Add test case checking required field in skill JSON file
add register page