Merge pull request #315 from Yahkob/bugFixes

Bug fixes
Merge pull request #316 from Yahkob/optimization

Optimization
optimization(public): switch all resources to dataURI and or sprite sheet