Bug30: Loading data from SQL into the CZ website takes too long
Merge pull request #55 from javierluraschi/Bug30

Bug30: Loading data from SQL into the CZ website takes too long
Bug56: Running code analysis finishes with 30+ warnings
Merge pull request #60 from javierluraschi/Bug56

Bug56: Running code analysis finishes with 30+ warnings
Merge with master