Fixed up the JSON merge script and cleaned up Document Search.
Merge branch 'master' of https://github.com/CU-CommunityApps/kuality-kfs-cu