Merge branch 'develop' of github.com:wayneyu/mer into develop
Merge branch 'wwy_develop' into develop
Add multiple hints and solutions to view and. Changed json file path to relative