g
Merge branch 'master' of https://github.com/MapYou/MapYou

Conflicts:
	Project/workspace/MapYou/src/it/mapyou/controller/AbstractCreator.java
	Project/workspace/MapYou/src/it/mapyou/controller/Creator.java
	Project/workspace/MapYou/src/it/mapyou/model/FactoryModelCreator.java
	Project/workspace/MapYou/src/it/mapyou/persistence/DAOCreator.java

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

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

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