moving to javaconfig

comment: merge from develop branch, move spring config from xml to javaConfig
reviewer: jhinojosa