Fixed api tests (SQUASHME into 45773f)
Implemented result highlighting in paging
Fixed bug in file paging (SQUASHME into 8413d9)
Revised SWID inventory