fix 1 in #597
Merge branch 'master' of git://github.com/yupe/yupe into 597-yupe.ru-0.5
fix 3 in #597
fix faqView in #597
Merge pull request #600 from mikspark/597-yupe.ru-0.5

Fix 1, 3 in #597