move to django 1.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	aor/templates/pybb/post_template.html
	aor/templates/pybb/topic_list.html
	aor/templates/pybb/user.html
fixed robots.txt