Merge branch 'master' into frankenweenie
Merge branch 'frankenweenie' of ssh://github.com/francocatena/libreduca into frankenweenie
Page and blocks cleanup
Merge branch 'frankenweenie' of ssh://github.com/francocatena/libreduca into frankenweenie

Conflicts:
	app/views/shared/_guest_page.html.erb