C

dd
Mer

Conflicts:
	Project/workspace/MapYou/src/it/mapyou/controller/Controller.java

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

	Project/workspace/MapYou/src/it/mapyou/persistence/impl/SQLiteUserDAO.java
	Project/workspace/MapYou/src/it/mapyou/sqlite/DatabaseHelper.java