Updated new entries for Kirby 2.0.4
Merge branch 'invasoria-patch-2' into develop