first fixes rent
Merge branch 'master' into admin

Conflicts:
	protected/views/layouts/admin.php
merge master
fixes admin panel
Merge branch 'master' of github.com:mazikwyry/ebud