menu problemen
Merge remote-tracking branch 'origin/master'

Conflicts:
	newstopia/static/js/index.js
Merge remote-tracking branch 'origin/master'
menu problemen