Prepping for merge
Refactored all th database classes
Made SQL abstract
Updated commons to be a singleton
Optimized sql statements and removed un-needed calls / redundancy