?
?
Merge branch 'master' of github.com:eturella/isife

Conflicts:
	.classpath
	build/classes/InboxReader.class