changed icons
moved preloader
Merge branch 'gh-pages'