Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Add reddit/python, utf8 problem.
Merge branch 'dev' of github.com:toomore/plurkbot

Conflicts:
	plurkbot/Rss.py
Merge branch 'dev'

Conflicts:
	plurkbot/Rss.py
Merge branch 'master' into dev