changed require mysql to mysql2
adding views, / controller from other branch
Merge remote-tracking branch 'origin/Clean_Importer' into Clean_Importer