Update
Merge branch 'master' of https://github.com/juliusiglesia/icslibsystem

Conflicts:
	application/views/admin/login_view.php
	application/views/admin/settings.php
Merge branch 'master' of https://github.com/juliusiglesia/icslibsystem
Update