check all
Merge branch 'master' of https://github.com/Hartorn/NR_newsletter

Conflicts:
	univnews/index.php
resolution conflit index.php