Updated ASSETS loader
Merge remote-tracking branch 'Sarbull/master'

Conflicts:
	application/controllers/main.php
	application/views/header.php