SIF List: Search, Filter and Sort
Merge branch 'ws_dev' of http://github.com/alfredoPacheco/IQS into ws_dev

Conflicts:
	app/views/sif_list.html