few changes
a
Merge branch 'master' of github.com:ha-D/SharifJobPortal
beginning of last phase
after
a
a
Quick fix
Add initial data
a
Hessam changes
Merge branch 'setareh'

Conflicts:
	src/jobs/views.py
	static/js/userpanel.js