update
update
Merge branch 'master' of https://github.com/fenderstrat/amonitro

Conflicts:
	application/controllers/artikel.php
	application/controllers/halaman.php
	application/controllers/welcome.php
	application/helpers/pagination_helper.php
	application/models/artikel_model.php