Merge branch 'master' of https://github.com/trajeta/doore_src.git

Conflicts:
	doore/src/com/bit/java54th/softdrink/doore/dao/MySqlVillageDAO.java