Merging changes to filter dialog with Johns changes
s
layout changes to the filter dialog
test
xx
CSS changes to the login screen
Sort INDIA out
Please back out if not required but the app logs on better now
without flashing
Merge branch 'master' of https://github.com/PeterPaulPeterPaul/ids.git

Conflicts:
	src/main/webapp/css/login.css
Adding back Login CSS Changes
Added trucks banner to bottom of page and resized the login box
Adding files sent by John
hopefully committing JH's changes to these files!
adding logos
icon in banner changes to login page and idsedit
1/2 changes made to the top display bar
Reverting changes so john can commit his changes
Pushing CSS changes