Merge pull request #108 from khoa-nd/master

Please pull the latest code
Added details for JAVA skill.
Merge remote-tracking branch 'origin/Release12' into Release12
Added "java ee" into search keywords.
fix bug for tour guide
update json for tour guide
Merge commit '0ac4eb0f9e6224bd280a5b9fe15554ea4d712bb4'
Merge commit '5640922e4643f00d4b2fd57b4b93a42d6b0050ff'