Small fixes.
Started to implement simple metadata model.
Merge branch 'master' of https://github.com/tuomaz/bhg-photos

Conflicts:
	src/main/java/se/bhg/photos/service/impl/PhotoServiceImpl.java