Merge branch 'dbxAdv'
fix casing and tensing in activity feed retraction
Merge branch 'document_paging'
Merge branch 'dbxAdv'
Merge branch 'master' of https://github.com/sharewave/frontus
Merge branch 'dbxAdv'
fix the frontend notification of bad file types and have the file picker limit the types shown

also, fixed several $scope.$apply instances
Merge branch 'file_types' into testing