Replaced non-localized 'line" by '@' .
Vocabulary enhancements.
Cleanup: upload.sh .
Repairing tests.
Fixing duplicate line in list view.
Vocabulary enhancements.
Merge branch 'gh-pages'