Merge pull request #41 from BE-FE/develop

Develop
Merge pull request #42 from BE-FE/develop

Develop
add image preloader
change preload
handle merge error
remove some code
handle conflict