dev01 commit
dev02 commit
fix bug
Merge branch 'dev02' into Combine

Conflicts:
	application/config/global.php
	application/index.php