reestablished project
Merge branch 'master' of https://github.com/xkommando/free-choice.net

Conflicts:
	.classpath
	.settings/com.genuitec.runtime.libraries.xml
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	.settings/org.eclipse.wst.common.project.facet.core.xml
	build/classes/net/freechoice/dao/IDao.class
	build/classes/net/freechoice/dao/IDao_Post.class
	build/classes/net/freechoice/dao/IDao_User.class
	build/classes/net/freechoice/dao/impl/DaoAux.class
	build/classes/net/freechoice/dao/impl/Dao_Post.class
	build/classes/net/freechoice/dao/impl/Dao_User.class
	src/net/freechoice/model/mapper/IMapper.java