WEB-2 Get all changes from webserver that are not already in git
WEB-1 fix notices if debug is on
WEB-3 wip show news
WEB-3 wip show news
WEB-3 wip show news
WEB-3 Format of Newslist
WEB-3 wip news site
WEB-3 news
Merge branch 'feature/layout_of_news' into develop
Merge branch 'release/2014-06-01_22-18'

Conflicts:
	functions.php