test
testMerge branch 'master' of https://github.com/yujunjie0603/projetcodeigniter

Conflicts:
	application/modules/template/views/homepage.php
test