Merge pull request #1543 from owncloud/utf8-locale-master

some systems use en_US.UTF8 instead of en_US.UTF-8

diff --cc lib/base.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc settings/templates/admin.php
Simple merge