Update favicon
+ change pagelayout elements
Merge branch 'dev' of https://github.com/FlipFlopWeekly/FlipFlop.git
into dev

Conflicts:
	src/FlipFlop/SiteBundle/Resources/views/Layout/base.html.twig