Add keywords to a user's interestswhen searching - not working
Fixed UserKeywordService updateKeyword function
Some fixes added
search feature updates (still not working)
Fixed some template bugs, addedsearch (still needs fixing)
Some code fixes and documentation added
merging needs fixing
merge fixed
Merge remote-tracking branch 'origin/test-dev-merge' into development