Login bijna af.
Merge branch 'master' into SJoerd

Conflicts:
	Resources/ui/common/MenuBarView.js
winkelwagen update