cc
Merge branch 'master' of https://github.com/jobadvisor/jobadvisor-app