Merge remote-tracking branch 'origin/master'

Conflicts:
	ektorp test/target/classes/org/ektorp/sample/BlogController.class
	ektorp test/target/classes/org/ektorp/sample/BlogPost.class
	ektorp test/target/classes/org/ektorp/sample/BlogPostRepository.class
	ektorp test/target/classes/org/ektorp/sample/Comment.class

web shop test

JSP sidor navigering