edit on 26 - OCt
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/autoload.php
	application/controllers/site.php
	application/controllers/subcat.php
	application/models/site_model.php
	application/models/subcat_model.php
	application/views/subcat.php