Merge remote-tracking branch 'or/master'
Merge remote-tracking branch 'origin/master'
Imports and cleanup
fuck git =)
Merge remote-tracking branch 'OR/master'

Conflicts:
	redspecies/settings/base.py
	redspecies/settings/dev.py
Merge remote-tracking branch 'OR/master'

Conflicts:
	redspecies/settings/base.py
	redspecies/settings/dev.py
Merge remote-tracking branch 'origin/master'
Admin customization
Hebrew trans
More hebrew Trans
Merge remote-tracking branch 'origin/master'

Conflicts:
	cma.cmd
	mma.cmd
	object_rate/admin.py
	object_rate/models.py
Merge remote-tracking branch 'or/master'
fix commit
tmp before merge (hoping there will be no disaster :-)
Merge commit '239db4f7025998b4367b8f1b4cf0d3546cffb857'
fixes after commit