adding spring form changes

have merged the Spring Forms project into this one.