Use JDK 1.6 instead of 1.5 (and additional ignores)
Merge branch 'aug04'

Conflicts:
	login/.gitignore