FRANKENN
Merge branch 'master' of https://github.com/markusebbesson/frankenstore

Conflicts:
	src/java/servlet/StoreServlet.java