fixed issue related to caching entities during sync_entities
bumped version
fixed conflict
Merge pull request #38 from wesleykendall/feature/optimize

Feature/optimize