added controller test
added character encoding filter
Merge remote-tracking branch 'origin/master'