move to django 1.5
Merge pull request #4 from lampslave/master

new "united" style for posts, some dark theme improvements
Merge pull request #5 from lampslave/master

added right margin for delete-post button
profile: avatar-clear checkbox moved to new line
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
fixed url tag
fixed url tag 2
fixed url tag 3
removed duplicate buttons
remove required attr from input controls
new quote features
quote selected title, some translations
updated bootstrap js, removed buggy bootstrap tooltips
new markitup buttons for dark theme
dark theme: fixed search button style
add max-height for user's signature
rollback "united" posts style
Merge remote-tracking branch 'upstream/master'

Conflicts:
	aor/templates/pybb/post_template.html