refactored I18n and dispatcher; removed cache bug
small changes
merge
json fix