added news
Merge branch 'devel'

Conflicts:
	app/models/User.php
	app/routes.php
	public/css/common.css