Removed some testing code. Converts mysql table to json, fixed encoding issues
Merge branch 'master' of https://github.com/msfe/MFCORRIGO