commit-before-pull 10/05/2013
Merge branch 'master' of git://github.com/Mparaiso/crudserviceprovider
merge-after-conflict 10/05/2013