update from rh branch
add recording uploads of file_id and user_id
build out uploads module
finish folder filtering
auto set files to shared
fix stuff I broke in the refresher
updated to pull cb userid in query
removed archive
add in delete file
updated language files some
finished changes for alias
update boxsearch module view and boxsearch component xml
committing
merge with Phil git