created settings
Merge branch 'master' of https://github.com/ramasamys/T_Report
resolved conflicts
created edit popup
Merge branch 'master' of https://github.com/ramasamys/T_Report

Conflicts:
	application/views/list_queue.php
	js/admin.js