modified:   app/css/all.css
	modified:   app/layout/top.php
Merge branch 'alex'

Conflicts:
	app/layout/top.php

	modified:   app/css/all.css
	modified:   app/layout/top.php