Menu Changes in CSS and DOM
Merge branch 'ndynan'

Conflicts:
	js/main.js
Fixed article template
Merge remote-tracking branch 'origin/master' into rpeterman