update .htaccess, app/config/config.php
Merge branch 'master' of github.com:joeangel/codeigniter-aexree