Updates
Merge branch 'master' of https://github.com/redlinx/ems

Conflicts:
	application/controllers/logout.php