d
h

Conflicts:

	Project/workspace/MapYou/src/it/mapyou/persistence/impl/SQLiteDAOManager.java