top jams update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/pl/itcrowd/domain/JamType.java