Fix possible NPE.
Merge branch 'master' of https://github.com/jjpe/Cookie
Compound java and cookie file.

The .java and .cookie file are now considered to be the same dataobject. This automatically hides the .cookie file.