fixed unsupported locale asset error
Merge branch 'master' into rails4