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

Conflicts:
	yodde/src/main/webapp/WEB-INF/views/store/storeInfo.jsp