a few changes
Merge branch 'master' of github.com:ha-D/SharifJobPortal into setareh
a
Hessam changes
Merge branch 'setareh'

Conflicts:
	static/js/userpanel.js