Merging changes to filter dialog with Johns changes
s
layout changes to the filter dialog
test
xx
CSS changes to the login screen
Merge branch 'master' of https://github.com/PeterPaulPeterPaul/ids.git

Conflicts:
	src/main/webapp/css/login.css