change layout and style css
modify style.css
Merge branch 'admin'

Conflicts:
	style.css
update style.css