New page layout
New page layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/tags/handlebars/Egbil.html
New page layout