Merge branch 'testing'

Conflicts:
	application/controllers/magazine.php