Fix encoding
Merge remote-tracking branch 'origin/master'
Fix encoding
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/tryrosberry/ololostfilm/logic/api/HtmlParser.java
fa