20141207
Merge branch 'master' of https://github.com/ruinra/yodde_spring.git

Conflicts:
	yodde/.settings/org.eclipse.core.resources.prefs
	yodde/src/main/java/com/yodde/storeModel/StoreDao.java
	yodde/src/main/java/com/yodde/storeModel/StoreDaoImp.java
	yodde/src/main/java/com/yodde/storeModel/StoreMapper.xml
	yodde/src/main/webapp/WEB-INF/spring/root-context.xml
	yodde/src/main/webapp/WEB-INF/views/main/main.jsp