integrated the spring sample
moving stuff around
small changes
Merge branch 'master' of github.com:veltzer/demos