to check testing branch progress Stage + commit and PUsh
Merge branch 'testing'

Conflicts:
	application/controllers/magazine.php
welcome comment change to check testing and master branch merge
Merge branch 'testing'