fix #36
fix #39
Merge branch 'master' of github.com:francocatena/libreduca

Conflicts:
	app/views/news/show.html.erb
	test/integration/news_test.rb