Conflicts:
	modules/core/app/assets/css/portal.less
	modules/core/app/models/GuidesPage.scala
	modules/guides/app/controllers/GuidesAdmin.scala
	modules/guides/app/views/create.scala.html
	modules/guides/app/views/edit.scala.html
	modules/guides/app/views/guidesAdminLayout.scala.html
	modules/guides/app/views/list.scala.html
	modules/guides/app/views/p/create.scala.html
	modules/guides/app/views/p/edit.scala.html
	modules/guides/app/views/p/list.scala.html
	modules/guides/app/views/renderForm.scala.html
	modules/guides/conf/messages
	modules/portal/app/controllers/portal/Guides.scala
	modules/portal/app/views/p/guides/ajax.scala.html
	modules/portal/app/views/p/guides/facet.scala.html
	modules/portal/app/views/p/guides/guidesList.scala.html
	modules/portal/app/views/p/guides/keywords.scala.html
	modules/portal/app/views/p/guides/markdown.scala.html
	modules/portal/app/views/p/guides/person.scala.html
	modules/portal/app/views/p/guides/places.scala.html
	modules/portal/app/views/p/layout/guideHeader.scala.html
	modules/portal/app/views/p/layout/guideLayout.scala.html
	modules/portal/app/views/p/layout/guideLayoutFacet.scala.html
	modules/portal/app/views/p/layout/guideSidebar.scala.html
	modules/portal/conf/messages