cleanup (never saw this message!)
include--
cleanup / reorder includes
use springbundle for spring version detection