nov 30
Merge branch 'master' of https://github.com/newsfoil/newsfoil

Conflicts:
	web/MyNewsRoom.jsp
	web/css/main.css