manger add shod
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
manger add shod
Merge remote-tracking branch 'origin/master'

Conflicts:
	mng/views.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
manger add shod
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
contract kamel shod
Merge remote-tracking branch 'origin/master'