Initial attempt at highlighting list view
Merge branch 'master' of https://github.com/shanti-uva/shantiHTML

Conflicts:
	js/main.js
search implementation: started highlighting list view (some known problems)

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   index.html
#	modified:   js/main.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/
#	src/jquery.fancytree.filter.js
#	src/json/nested-formatted.json
Merge branch 'master' of https://github.com/shanti-uva/shantiHTML

Conflicts:
	js/main.js
Fixed merge problem with fancytree configs