fix merge fail
mergefails. mergefails everywhere!
fix crash during search
Don't fail when SEARCHSTRIP setting is missing
no double blocks
make it safe to delete a user
Add DepartmentUser to admin interface
add department to deviceform
don't crash when widget are duplicate
API call to display profile of active user
display department name for devices
fix api department filtering for devices
allow api search arguments to be used multiple times
fix autocomplete fail
fix api search
Add smalldevices to device list. Fixes #117
Revert "Add smalldevices to device list. Fixes #117"

This reverts commit 529a44b817fe95c2f750aea24ce2a12d025136f2.
add smalldevices to device list
allow editing when no department is set
display hostname in device details