fix merge conflicts
Merge branch 'master' of github.com:fernvilla/DevJobMappr
Fix merge issues