Merge branch 'develop' of github.com:CaSoft/CodeIgniter into develop