last changes...
Merge branch 'master' of https://github.com/Micev/PHP-Teamwork

Conflicts:
	header.php
	style/menu.css