haist
Merge branch 'master' of https://github.com/sjdayo/qdf

Conflicts:
	application/modules/components/views/table.php
haist