comment: merge from develop branch, move spring config from xml to javaConfig
reviewer: jhinojosa
Merge pull request #2 from jonathanlarav/develop

moving to javaconfig