slide & news
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	css/main.css