move spring & guard to development group
Merge branch 'tmp'