html parsing lib
mereg fix
merge fix
Merge branch 'master' of https://github.com/mariusciziunas/organizer

Conflicts:
	Organizer/.classpath