App Id fix
Merge branch 'master' of https://github.com/argeset/set-locale
View/Admin/Apps conflict fix
Merge branch 'master' of https://github.com/argeset/set-locale

Conflicts:
	src/client/SetLocale.Client.Web/Models/AppModel.cs
	src/client/SetLocale.Client.Web/Views/Admin/Apps.cshtml
some changes
some conflict fix
Merge branch 'master' of https://github.com/argeset/set-locale