Javadoc generated
Javadoc Generated
Merge branch 'master' of https://github.com/marmundo/eer

Conflicts:
	doc/package-list