Merge branch 'master' of github.com:ictish/codeIgniter
database fixed
Merge branch 'hmvc' of github.com:ictish/codeIgniter
testing