Added Remove link for devices
Added user_id field to device forms for admins
Merge branch 'small_fixes'