ffsd2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Janlist/.idea/workspace.xml
	Janlist/js/Core/Views/LoginForm.js
+modal+loginform