c
Sec
Merge branch 'master' of https://github.com/phash/bidd.git

Conflicts:
	src/main/java/de/mroedig/bidd/DetailSeite.html