Conflicts:
	admin/templates/index.php
	templates/layout.admin.php
	templates/layout.user.php

All conflicts are fixed.