remove pydev pydevproject
deleted pydev files
reset branch for django 1.4
Merge remote-tracking branch 'origin/forum' into forum

Conflicts:
	django_cas/middleware.py