removed breadcrumbs
added favicon
Merge branch 'master' of https://github.com/OSN64/UserInterfaceProject

Conflicts:
	templates/gallery.tpl
	templates/layout.tpl
	templates_c/21bbd61b32d765e50626966b3a11b355a8b4ef81.file.recipes.tpl.php
	templates_c/7d303b2f7cd87ae72a62416ca221bc8c45c6388a.file.gallery.tpl.php
	templates_c/a05a7b8b1f5e72808bdcb576f7ec0fe40032c1d7.file.contact.tpl.php
	templates_c/c0360d049dff10f364dfc53ba2cc3958abf6ee6d.file.index.tpl.php
	templates_c/f45d8ababa5d6f5c301aa6e6fbb98df40da92477.file.about.tpl.php
fixed merge