update file registry
update file registry
deleted articles
deleted article
delete
file registry/delete article
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
Update file registry
Update file registry
Merge pull request #10 from diaarezz/master

Delete arcticle and create search for Onloan To column
delete assets
add assetviews in location
migration for location combo code
updates for student residence
student resident fixes
Test