css changes
Pushing IDSMAIN again
Merge branch 'master' of https://github.com/PeterPaulPeterPaul/ids.git
into tst2

Conflicts:
	src/main/webapp/pages/idsmain.jsp
vv
Merge branch 'master' of https://github.com/PeterPaulPeterPaul/ids.git into tst2