conflict
conflict
Merge branch 'master' of https://github.com/jobinrefer/dev
add coremodels
Merge branch 'master' of https://github.com/jobinrefer/dev

Conflicts:
	jobconnector/src/jobconnector/settings.py