preloader refactored
merge conflict fixed
Merge pull request #125 from red-admirals-2014/preload_refactoring

preloader refactored