delete
change frontend
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/site/index.php
	views/site/view.php
	web/css/site.css
merged
fix preload