Blocking update
Merge branch 'master' of https://github.com/progutvikling/picture-browser

Conflicts:
	src/main/java/dal/admin/ImageStore.java
	src/test/java/test/StoreBlockingTest.java