DB connection update
Merge branch 'production' of https://github.com/nsclick/inalco into production
Fixed some base files
Merge branch 'production' of https://github.com/nsclick/inalco into production
Fixed some base files
Merge branch 'production' of https://github.com/nsclick/inalco into production
Merge branch 'master' into production
Merge branch 'master' into production
Some fixes
Merged latest changes from master
Merge branch 'master' into production
Merge branch 'production' of https://github.com/nsclick/inalco into production
Merged with master
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Fixed conflict at .htaccess
Merge branch 'master' into production