data loading refactor
fixed code according to daniel's comments + moved all static localization out of the db.
Merge pull request #133 from odedlaz/data_loading_refactor

data loading refactor