#17 News Page and Detail Article Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	wsgi/restaurant/static/css/main.css
#17 News Page and Detail Article Page