Merge remote-tracking branch 'upstream/master'
merging
#468 - Menu item (status & movement) fixed
File registry feature
Merge remote-tracking branch 'upstream/master'
merge upstream
#465 - 1.2.6-Asset on Loan page...Show page(button revised), Approve+Return(added into Edit page)+misc updates
Merge branch 'trellocard-465-approve'
Merge pull request #255 from Nurhashimah/master

#468 - Menu item (status & movement) fixed
Merge pull request #256 from azimadnan/master

Card #481Feature for file registry
#438 search function in asset index page
#438 fix search asset index page
Merge pull request #258 from mkamalsaedon/master

#438 search function in asset index page(fix)
#460 - create link entity form as a form
Merge pull request #259 from Nurhashimah/master

#460 - create link entity form as a form
#460 - user-entity (revised) + #447-student discipline (search-fixed)
revision for student-staff-link
#465 - New asset loan(loanables)+add error msg - asset defect new/edit
#487 - Roles List
Merge pull request #260 from Nurhashimah/master

Revision for User - Entity link + fixes for student discipline basic index search
Merge pull request #261 from irshad89/master

fix error report/download
sort kewpa 4,5