Merge branch 'footable'
Merge branch 'footable'
fixed mysqli issue on production
Merge branch 'master' into footable